diff --git a/core/lib/Thelia/Form/CustomerCreation.php b/core/lib/Thelia/Form/CustomerCreation.php
index cc74585e7..d728a515d 100755
--- a/core/lib/Thelia/Form/CustomerCreation.php
+++ b/core/lib/Thelia/Form/CustomerCreation.php
@@ -40,6 +40,16 @@ class CustomerCreation extends BaseForm
     {
         $this->formBuilder
             ->add("auto_login", "integer")
+            // Personal Informations
+            ->add("title", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Title"),
+                "label_attr" => array(
+                    "for" => "title"
+                )
+            ))
             ->add("firstname", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
@@ -58,84 +68,6 @@ class CustomerCreation extends BaseForm
                     "for" => "lastname"
                 )
             ))
-            ->add("address1", "text", array(
-                "constraints" => array(
-                    new Constraints\NotBlank()
-                ),
-                "label_attr" => array(
-                    "for" => "address"
-                ),
-                "label" => Translator::getInstance()->trans("Street Address"),
-                "label_attr" => array(
-                    "for" => "address1"
-                )
-            ))
-            ->add("address2", "text", array(
-                "label" => Translator::getInstance()->trans("Address Line 2"),
-                "label_attr" => array(
-                    "for" => "address2"
-                )
-            ))
-            ->add("address3", "text", array(
-                "label" => Translator::getInstance()->trans("Address Line 3"),
-                "label_attr" => array(
-                    "for" => "address3"
-                )
-            ))
-            ->add("company", "text", array(
-                "label" => Translator::getInstance()->trans("Company Name"),
-                "label_attr" => array(
-                    "for" => "company"
-                )
-            ))
-            ->add("phone", "text", array(
-                "label" => Translator::getInstance()->trans("Phone"),
-                "label_attr" => array(
-                    "for" => "phone"
-                )
-            ))
-            ->add("cellphone", "text", array(
-                "label" => Translator::getInstance()->trans("Cellphone"),
-                "label_attr" => array(
-                    "for" => "cellphone"
-                )
-            ))
-            ->add("zipcode", "text", array(
-                "constraints" => array(
-                    new Constraints\NotBlank()
-                ),
-                "label" => Translator::getInstance()->trans("Zip code"),
-                "label_attr" => array(
-                    "for" => "zipcode"
-                )
-            ))
-            ->add("city", "text", array(
-                "constraints" => array(
-                    new Constraints\NotBlank()
-                ),
-                "label" => Translator::getInstance()->trans("City"),
-                "label_attr" => array(
-                    "for" => "city"
-                )
-            ))
-            ->add("country", "text", array(
-                "constraints" => array(
-                    new Constraints\NotBlank()
-                ),
-                "label" => Translator::getInstance()->trans("Country"),
-                "label_attr" => array(
-                    "for" => "country"
-                )
-            ))
-            ->add("title", "text", array(
-                "constraints" => array(
-                    new Constraints\NotBlank()
-                ),
-                "label" => Translator::getInstance()->trans("Title"),
-                "label_attr" => array(
-                    "for" => "title"
-                )
-            ))
             ->add("email", "email", array(
                 "constraints" => array(
                     new Constraints\NotBlank(),
@@ -143,7 +75,7 @@ class CustomerCreation extends BaseForm
                     new Constraints\Callback(array(
                         "methods" => array(
                             array($this,
-                            "verifyExistingEmail")
+                                "verifyExistingEmail")
                         )
                     ))
                 ),
@@ -163,6 +95,79 @@ class CustomerCreation extends BaseForm
                 ),
                 "label" => "email confirmation"
             ))*/
+            ->add("phone", "text", array(
+                "label" => Translator::getInstance()->trans("Phone"),
+                "label_attr" => array(
+                    "for" => "phone"
+                ),
+                "required" => false
+            ))
+            ->add("cellphone", "text", array(
+                "label" => Translator::getInstance()->trans("Cellphone"),
+                "label_attr" => array(
+                    "for" => "cellphone"
+                ),
+                "required" => false
+            ))
+            // Delivery Informations
+            ->add("company", "text", array(
+                "label" => Translator::getInstance()->trans("Company Name"),
+                "label_attr" => array(
+                    "for" => "company"
+                ),
+                "required" => false
+            ))
+            ->add("address1", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Street Address"),
+                "label_attr" => array(
+                    "for" => "address1"
+                )
+            ))
+            ->add("address2", "text", array(
+                "label" => Translator::getInstance()->trans("Address Line 2"),
+                "label_attr" => array(
+                    "for" => "address2"
+                ),
+                "required" => false
+            ))
+            ->add("address3", "text", array(
+                "label" => Translator::getInstance()->trans("Address Line 3"),
+                "label_attr" => array(
+                    "for" => "address3"
+                ),
+                "required" => false
+            ))
+            ->add("city", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("City"),
+                "label_attr" => array(
+                    "for" => "city"
+                )
+            ))
+            ->add("zipcode", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Zip code"),
+                "label_attr" => array(
+                    "for" => "zipcode"
+                )
+            ))
+            ->add("country", "text", array(
+                "constraints" => array(
+                    new Constraints\NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Country"),
+                "label_attr" => array(
+                    "for" => "country"
+                )
+            ))
+            // Login Information
             ->add("password", "password", array(
                 "constraints" => array(
                     new Constraints\NotBlank(),
@@ -186,8 +191,14 @@ class CustomerCreation extends BaseForm
                     "for" => "password_confirmation"
                 )
             ))
-
-        ;
+            ->add("agreed", "checkbox", array(
+                "constraints" => array(
+                    new Constraints\True(array("message" => "Please accept the Terms and conditions in order to register."))
+                ),
+                "label_attr" => array(
+                    "for" => "agreed"
+                )
+            ));
     }
 
     public function verifyPasswordField($value, ExecutionContextInterface $context)