diff --git a/core/lib/Thelia/Form/CustomerLogin.php b/core/lib/Thelia/Form/CustomerLogin.php
index dee785735..4948586d7 100755
--- a/core/lib/Thelia/Form/CustomerLogin.php
+++ b/core/lib/Thelia/Form/CustomerLogin.php
@@ -25,6 +25,7 @@ namespace Thelia\Form;
 use Symfony\Component\Validator\Constraints;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\Email;
+use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ExecutionContextInterface;
 use Thelia\Core\Translation\Translator;
 use Thelia\Model\Base\CustomerQuery;
@@ -67,9 +68,6 @@ class CustomerLogin extends BaseForm
                 "data" => 0
             ))
             ->add("password", "password", array(
-                "constraints" => array(
-                    new Constraints\NotBlank()
-                ),
                 "label" => Translator::getInstance()->trans("Please enter your password"),
                 "label_attr" => array(
                     "for" => "password"
@@ -90,6 +88,18 @@ class CustomerLogin extends BaseForm
                 $context->addViolation("A user already exists with this email address. Please login or if you've forgotten your password, go to Reset Your Password.");
             }
         }
+
+        //$propertyPath =
+        $context->getViolations()->add(new ConstraintViolation(
+            'failed password',
+            'toto',
+            array(),
+            $context->getRoot(),
+            'children[password].data',
+            'propertyPath'
+        ));
+
+
     }
 
     public function getName()
diff --git a/templates/default/assets/js/script.js b/templates/default/assets/js/script.js
index 2cc7d4b99..cc351f27c 100644
--- a/templates/default/assets/js/script.js
+++ b/templates/default/assets/js/script.js
@@ -159,6 +159,78 @@
             }).filter(':has(:checked)').addClass('active');
         });
 
+
+        if($("body").is(".page-product")){
+
+            var $quantityInput  = $("#quantity");
+
+
+            var $btnAddToCart   = $(".btn_add_to_cart", $("#form-product-details"));
+
+            var $productMeta    = $("#stockInformations");
+
+            var $inStock        = $(".in",$productMeta);
+            var $outOfStock     = $(".out",$productMeta);
+
+            var $old_price_container    = $(".old-price", $("#product-details"));
+
+
+            // Switch Quantity in product page
+            $("select", $(".product-options")).change(function(){
+                var $select_quantity        = $(this).find(":selected").attr("data-quantity");
+                var $old_price              = $(this).find(":selected").attr("data-old-price");
+
+                var $best_price             = $(this).find(":selected").attr("data-price");
+
+                $quantityInput.attr("max", $select_quantity);
+
+                // Show Out Of Stock OR In Stock
+                if($select_quantity == 0){
+                    $btnAddToCart.attr("disabled", true);
+
+                    $productMeta.removeClass("in-stock");
+                    $productMeta.addClass("out-of-stock");
+
+                    $productMeta.attr("href", "http://schema.org/OutOfStock");
+
+                    $outOfStock.show();
+                    $inStock.hide();
+
+                }else{
+                    $btnAddToCart.attr("disabled", false);
+
+                    $productMeta.removeClass("out-of-stock");
+                    $productMeta.addClass("in-stock");
+
+                    $productMeta.attr("href", "http://schema.org/InStock");
+
+                    $inStock.show();
+                    $outOfStock.hide();
+                }
+
+                if(parseInt($quantityInput.val()) > parseInt($select_quantity)){
+                    $quantityInput.val($select_quantity);
+                }
+
+                if($old_price_container.size() > 0 ){
+                    $(".price", $old_price_container).html($old_price);
+                    $(".price", $(".special-price")).html($best_price);
+                }else{
+                    $(".price", $(".regular-price")).html($best_price);
+                }
+
+            }).change();
+
+            $quantityInput.focusout(function() {
+                $quantityInput.attr("max", $select_quantity);
+                if(parseInt($quantityInput.val()) > parseInt($select_quantity)){
+                    $quantityInput.val($select_quantity);
+                }
+            });
+        }
+
+
+
         $('#limit-top').change(function(e){
             window.location = $(this).val()
         });
diff --git a/templates/default/assets/less/thelia/product.less b/templates/default/assets/less/thelia/product.less
index e3b26c683..c1f9f4ec2 100755
--- a/templates/default/assets/less/thelia/product.less
+++ b/templates/default/assets/less/thelia/product.less
@@ -15,10 +15,20 @@
     .in-stock {
         font-style: italic;
         text-transform: uppercase;
+
+      .quantity{
+        font-style: italic;
+      }
+    }
+    // Out of Stock
+    .out-of-stock {
+      font-style: italic; font-weight: bold;
+      text-transform: uppercase;
     }
 
-    // Out of Stock
-    .out-of-stock {}
+    #stockInformations{
+
+    }
 }
 
 
diff --git a/templates/default/assets/themes/default/less/theme.less b/templates/default/assets/themes/default/less/theme.less
index 2bc0dceed..32a8063fc 100755
--- a/templates/default/assets/themes/default/less/theme.less
+++ b/templates/default/assets/themes/default/less/theme.less
@@ -260,6 +260,7 @@ header {
         content: @shopping-cart;
         font-size: 1.3em;
     }
+
 }
 
 // Cart - Remove button
@@ -512,6 +513,7 @@ td.product,
                 }
 
                 .product-btn {
+                    min-height: 26px;
                     .btn-cart {
                         .btn-block;
                     }
diff --git a/templates/default/product.html b/templates/default/product.html
index cfc70e688..7f9b9f04d 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -88,9 +88,32 @@
                     </div>
                 </div>
 
+                {loop name="stock_meta" type="product_sale_elements" product="$ID"}
+                    {loop name="combi_meta" type="attribute_combination" product_sale_elements="$ID"}
+                       {if $LOOP_COUNT == 0}
+                           {if $QUANTITY == 0}
+
+                               {assign  var="current_stock_class" value = "out-of-stock"}
+                               {assign  var="current_stock_href" value = "http://schema.org/OutOfStock"}
+
+                               {else}
+
+                               {assign  var="current_stock_class" value = "out-of-stock"}
+                               {assign  var="current_stock_href" value = "http://schema.org/OutOfStock"}
+
+                           {/if}
+                       {/if}
+                    {/loop}
+                {/loop}
 
                 <div class="product-price" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-                    <div class="availability"><span class="availibity-label">{intl l="Availability"}: </span><span itemprop="availability" href="http://schema.org/InStock" class="in-stock">In stock</span></div>
+                    <div class="availability">
+                        <span class="availibity-label">{intl l="Availability"}: </span>
+                        <span itemprop="availability" href="{$current_stock_href}" class="{$current_stock_class}" id="stockInformations">
+                            <span class="in">{intl l='In stock'}</span><span class="out">{intl l='Out of stock'}</span>
+
+                        </span>
+                    </div>
 
                     <div class="price-container">
                         {loop type="category" name="category_tag" id=$DEFAULT_CATEGORY}
@@ -98,14 +121,6 @@
                         {/loop}
                         <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
                         <meta itemprop="priceCurrency" content="{currency attr="symbol"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
-                        <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
-                        <!-- List of availibility :
-                            out_of_stock : http://schema.org/OutOfStock
-                            in_stock : http://schema.org/InStock
-                            instore_only : http://schema.org/InStoreOnly
-                            preorder : http://schema.org/PreOrder
-                            online_only : http://schema.org/OnlineOnly
-                        -->
                         {if $IS_PROMO }
                         {loop name="productSaleElements_promo" type="product_sale_elements" product="{$ID}" limit="1" order="min_price"}
                             {assign var="default_product_sale_elements" value="$ID"}
@@ -136,36 +151,24 @@
                     {/if}
                     {/form_field}
                     {form_field form=$form field="product"}
-                    <input id="{$label_attr.for}" type="hidden" name="{$name}" value="{$ID}" {$attr} >
+                        <input id="{$label_attr.for}" type="hidden" name="{$name}" value="{$ID}" {$attr} >
                     {/form_field}
+
                     <fieldset class="product-options">
-                        <div class="option option-color">
-                            <label for="option-color" class="option-heading">Show</label>
+                        {ifloop rel="stock"}
+                        <div class="option">
+                            <label for="options" class="option-heading">Options</label>
                             <div class="option-content">
-                                <select id="option-color" name="option-color" class="form-control">
-                                    <option value="0">Blue</option>
-                                    <option value="1">Red</option>
-                                    <option value="2">Purple</option>
+                                <select name="options" class="form-control">
+                                    {loop name="stock" type="product_sale_elements" product="$ID"}
+                                        {loop name="combi" type="attribute_combination" product_sale_elements="$ID"}
+                                            <option value="{$ID}" data-quantity="{$QUANTITY}" data-price="{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}" data-old-price="{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}">{$ATTRIBUTE_AVAILABILITY_TITLE}</small></option>
+                                        {/loop}
+                                    {/loop}
                                 </select>
                             </div>
                         </div>
-
-                        <div class="option option-size">
-                            <fieldset>
-                                <legend class="option-heading">Size</legend>
-                                <div class="option-content">
-                                    <label class="checkbox-inline" for="size1">
-                                        <input type="checkbox" name="size1" id="size1" value="1"> Large
-                                    </label>
-                                    <label class="checkbox-inline" for="size2">
-                                        <input type="checkbox" name="size2" id="size2" value="2"> Medium
-                                    </label>
-                                    <label class="checkbox-inline" for="size3">
-                                        <input type="checkbox" name="size3" id="size3" value="3"> Small
-                                    </label>
-                                </div>
-                            </fieldset>
-                        </div>
+                        {/ifloop}
                     </fieldset>
                     <fieldset class="product-cart form-inline">
                         {form_field form=$form field='quantity'}
@@ -201,10 +204,11 @@
                         {ifloop rel="feature_value_info"}
                         <ul>
                         {loop name="feature_info" type="feature" product="{$ID}"}
-                            <li> <strong>{$TITLE}</strong> :
-                            {loop name="feature_value_info" type="feature_value" feature="{$ID}" product="{product attr="id"}"}
-                                {$TITLE}
-                            {/loop}
+                            <li>
+                                <strong>{$TITLE}</strong> :
+                                {loop name="feature_value_info" type="feature_value" feature="{$ID}" product="{product attr="id"}"}
+                                    {$TITLE}
+                                {/loop}
                             </li>
                         {/loop}
                         </ul>