diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 3235171df..7aaad391a 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -37,6 +37,11 @@
         <default key="_controller">Thelia\Controller\Admin\CustomerController::indexAction</default>
     </route>
 
+    <route id="admin.customer.update.view" path="/admin/customer/update/{customer_id}">
+        <default key="_controller">Thelia\Controller\Admin\CustomerController::viewAction</default>
+        <requirement key="customer_id">\d+</requirement>
+    </route>
+
     <!-- end Customer rule management -->
 
     <!-- Categories management -->
diff --git a/core/lib/Thelia/Controller/Admin/CustomerController.php b/core/lib/Thelia/Controller/Admin/CustomerController.php
index 04c8842cd..99ae37d21 100644
--- a/core/lib/Thelia/Controller/Admin/CustomerController.php
+++ b/core/lib/Thelia/Controller/Admin/CustomerController.php
@@ -37,4 +37,12 @@ class CustomerController extends BaseAdminController
 
         return $this->render("customers", array("display_customer" => 20));
     }
+
+    public function viewAction($customer_id)
+    {
+
+    	return $this->render("customer-edit", array(
+    		"customer_id" => $customer_id
+    	));
+    }
 }
\ No newline at end of file
diff --git a/core/lib/Thelia/Form/CustomerCreation.php b/core/lib/Thelia/Form/CustomerCreation.php
index 1bc88407b..f95dd33d5 100755
--- a/core/lib/Thelia/Form/CustomerCreation.php
+++ b/core/lib/Thelia/Form/CustomerCreation.php
@@ -43,19 +43,28 @@ class CustomerCreation extends BaseForm
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "firstname"
+                "label" => "Firstname",
+                "label_attr" => array(
+                    "for" => "firstname"
+                )
             ))
             ->add("lastname", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "lastname"
+                "label" => "Lastname",
+                "label_attr" => array(
+                    "for" => "lastname"
+                )
             ))
             ->add("address1", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "address"
+                "label" => "Address",
+                "label_attr" => array(
+                    "for" => "address"
+                )
             ))
             ->add("address2", "text", array(
                 "label" => "Address Line 2"
@@ -64,28 +73,43 @@ class CustomerCreation extends BaseForm
                 "label" => "Address Line 3"
             ))
             ->add("phone", "text", array(
-                "label" => "phone"
+                "label" => "Phone",
+                "label_attr" => array(
+                    "for" => "phone"
+                )
             ))
             ->add("cellphone", "text", array(
-                "label" => "cellphone"
+                "label" => "Cellphone",
+                "label_attr" => array(
+                    "for" => "cellphone"
+                )
             ))
             ->add("zipcode", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "zipcode"
+                "label" => "Zip code",
+                "label_attr" => array(
+                    "for" => "zipcode"
+                )
             ))
             ->add("city", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "city"
+                "label" => "City",
+                "label_attr" => array(
+                    "for" => "city"
+                )
             ))
             ->add("country", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "country"
+                "label" => "Country",
+                "label_attr" => array(
+                    "for" => "country"
+                )
             ))
             ->add("title", "text", array(
                 "constraints" => array(
@@ -104,7 +128,10 @@ class CustomerCreation extends BaseForm
                         )
                     ))
                 ),
-                "label" => "email"
+                "label" => "Email",
+                "label_attr" => array(
+                    "for" => "email"
+                )
             ))
             ->add("email_confirm", "email", array(
                 "constraints" => array(
@@ -115,14 +142,20 @@ class CustomerCreation extends BaseForm
                         )
                     ))
                 ),
-                "label" => "email confirmation"
+                "label" => "Email confirmation",
+                "label_attr" => array(
+                    "for" => "email-confirmation"
+                )
             ))
             ->add("password", "password", array(
                 "constraints" => array(
                     new Constraints\NotBlank(),
                     new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4)))
                 ),
-                "label" => "password"
+                "label" => "Password",
+                "label_attr" => array(
+                    "for" => "password"
+                )
             ))
             ->add("password_confirm", "password", array(
                 "constraints" => array(
@@ -132,7 +165,10 @@ class CustomerCreation extends BaseForm
                         array($this, "verifyPasswordField")
                     )))
                 ),
-                "label" => "password confirmation"
+                "label" => "Password confirmation",
+                "label_attr" => array(
+                    "for" => "password-confirmation"
+                )
             ))
 
         ;
diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index ea498f72c..e7a8c37d2 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -10,130 +10,198 @@
 
 
     <div class="catalog">
-    <div id="wrapper" class="container">
+        <div id="wrapper" class="container">
 
 
-    {module_include location='customer_top'}
+            {module_include location='customer_top'}
 
-    <div class="row">
-        <div class="col-md-12">
-            <div class="general-block-decorator">
-                <table class="table table-striped table-condensed" id="customer_list">
-                    <caption>
-                        {intl l="Customers list"}
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="general-block-decorator">
+                        <table class="table table-striped table-condensed" id="customer_list">
+                            <caption>
+                                {intl l="Customers list"}
 
-                        {module_include location='customer_list_caption'}
+                                {module_include location='customer_list_caption'}
 
-                        {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.customers.create"}
-                            <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new Customer'}" href="#add_customer_dialog" data-toggle="modal">
-                                <span class="glyphicon glyphicon-plus-sign"></span>
-                            </a>
-                        {/loop}
-                    </caption>
+                                {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.customers.create"}
+                                    <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new Customer'}" href="#add_customer_dialog" data-toggle="modal">
+                                        <span class="glyphicon glyphicon-plus-sign"></span>
+                                    </a>
+                                {/loop}
+                            </caption>
 
-                    {ifloop rel="customer_list"}
-                        <thead>
-                        <tr>
-                            <th class="object-title">
-                                {intl l="customer ref"}
-                            </th>
+                            {ifloop rel="customer_list"}
+                                <thead>
+                                <tr>
+                                    <th class="object-title">
+                                        {intl l="customer ref"}
+                                    </th>
 
-                            <th class="object-title">
-                                {intl l="company"}
-                            </th>
+                                    <th class="object-title">
+                                        {intl l="company"}
+                                    </th>
 
-                            {module_include location='category_list_header'}
+                                    {module_include location='category_list_header'}
 
-                            <th>
-                                {intl l="firstname & lastname"}
-                            </th>
+                                    <th>
+                                        {intl l="firstname & lastname"}
+                                    </th>
 
-                            <th>
-                                {intl l="last order"}
-                            </th>
+                                    <th>
+                                        {intl l="last order"}
+                                    </th>
 
-                            <th>{intl l='order amount'}</th>
+                                    <th>{intl l='order amount'}</th>
 
-                            <th>{intl l='Actions'}</th>
-                        </tr>
-                        </thead>
+                                    <th>{intl l='Actions'}</th>
+                                </tr>
+                                </thead>
 
-                        <tbody>
-                        {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
-                            <tr>
-                                <td>{#REF}</td>
+                                <tbody>
+                                {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
+                                    <tr>
+                                        <td>{#REF}</td>
 
-                                <td>
-                                    {#COMPANY}
-                                </td>
+                                        <td>
+                                            {#COMPANY}
+                                        </td>
 
-                                <td class="object-title">
-                                    {#FIRSTNAME} {#LASTNAME}
-                                </td>
+                                        <td class="object-title">
+                                            {#FIRSTNAME} {#LASTNAME}
+                                        </td>
 
-                                {module_include location='customer_list_row'}
+                                        {module_include location='customer_list_row'}
 
-                                <td>
-                                    {format_date date=$LASTORDER_DATE}
-                                </td>
+                                        <td>
+                                            {format_date date=$LASTORDER_DATE}
+                                        </td>
 
-                                <td>
-                                    {format_number number=$LASTORDER_AMOUNT}
-                                </td>
-                                <td>
-                                    <div class="btn-group">
+                                        <td>
+                                            {format_number number=$LASTORDER_AMOUNT}
+                                        </td>
+                                        <td>
+                                            <div class="btn-group">
 
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.customer.edit"}
-                                            <a class="btn btn-default btn-xs" title="{intl l='Edit this customer'}" href="{url path="/admin/customer/update/{$ID}" }"><i class="glyphicon glyphicon-edit"></i></a>
-                                        {/loop}
-                                        {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
-                                            <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{#EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
-                                        {/loop}
-                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
-                                            <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
-                                        {/loop}
-                                    </div>
-                                </td>
+                                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.customer.edit"}
+                                                    <a class="btn btn-default btn-xs" title="{intl l='Edit this customer'}" href="{url path="/admin/customer/update/{$ID}" }"><i class="glyphicon glyphicon-edit"></i></a>
+                                                {/loop}
+                                                {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
+                                                    <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{#EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
+                                                {/loop}
+                                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
+                                                    <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                                {/loop}
+                                            </div>
+                                        </td>
 
-                            </tr>
-                        {/loop}
-                        </tbody>
-                    {/ifloop}
-                </table>
+                                    </tr>
+                                {/loop}
+                                </tbody>
+                            {/ifloop}
+                        </table>
+                    </div>
+                </div>
             </div>
+
+
+            {module_include location='customer_bottom'}
+            <div class="row">
+                <div class="col-md-12 text-center">
+
+                    <ul class="pagination pagination-centered">
+                        {if #customer_page != 1}
+                            <li><a href="{url path="/admin/customers" page="1"}">&laquo;</a></li>
+                        {else}
+                            <li class="disabled"><a href="#">&laquo;</a></li>
+                        {/if}
+
+                    {pageloop rel="customer_list"}
+                        {if #PAGE != #CURRENT}
+                            <li><a href="{url path="/admin/customers" page="#PAGE"}">#PAGE</a></li>
+                        {else}
+                            <li class="active"><a href="#">#PAGE</a></li>
+                        {/if}
+
+                        {if #PAGE == #LAST && #LAST != #CURRENT}
+                            <li><a href="{url path="/admin/customers" page="#PAGE"}">&raquo;</a></li>
+                        {else}
+                            <li class="disabled"><a href="#">&raquo;</a></li>
+                        {/if}
+                    {/pageloop}
+                    </ul>
+                </div>
+            </div>
+
         </div>
     </div>
 
+    {* Adding a new Category *}
 
-    {module_include location='customer_bottom'}
-    <div class="row">
-        <div class="col-md-12 text-center">
 
-            <ul class="pagination pagination-centered">
-                {if #customer_page != 1}
-                    <li><a href="{url path="/admin/customers" page="1"}">&laquo;</a></li>
-                {else}
-                    <li class="disabled"><a href="#">&laquo;</a></li>
-                {/if}
+    {form name="thelia.customer.creation"}
 
-            {pageloop rel="customer_list"}
-                {if #PAGE != #CURRENT}
-                    <li><a href="{url path="/admin/customers" page="#PAGE"}">#PAGE</a></li>
-                {else}
-                    <li class="active"><a href="#">#PAGE</a></li>
-                {/if}
+        {* Capture the dialog body, to pass it to the generic dialog *}
+        {capture "customer_creation_dialog"}
 
-                {if #PAGE == #LAST && #LAST != #CURRENT}
-                    <li><a href="{url path="/admin/customers" page="#PAGE"}">&raquo;</a></li>
-                {else}
-                    <li class="disabled"><a href="#">&raquo;</a></li>
-                {/if}
-            {/pageloop}
-            </ul>
-        </div>
-    </div>
+            {form_hidden_fields form=$form}
 
-    </div>
-    </div>
+            {form_field form=$form field='success_url'}
+               {* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller  *}
+               <input type="hidden" name="{$name}" value="{url path='/admin/customer/update/_ID_'}" />
+            {/form_field}
+            
+            {form_field form=$form field='firstname'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Firstname'}" placeholder="{intl l='Firstname'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='lastname'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Lastname'}" placeholder="{intl l='Lastname'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='address1'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Address'}" placeholder="{intl l='Address'}">                    
+                </div>
+
+                <div class="form-group">
+                    {form_field form=$form field='address2'}
+                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Additional address'}" placeholder="{intl l='Additional address'}">
+                    {/form_field}                    
+                </div>
+
+                <div class="form-group">
+                    {form_field form=$form field='address3'}
+                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Additional address'}" placeholder="{intl l='Additional address'}">
+                    {/form_field}
+                </div>
+            {/form_field}
+
+            
+            
+        {/capture}
+
+        {include
+            file = "includes/generic-create-dialog.html"
+
+            dialog_id    = "add_customer_dialog"
+            dialog_title = {intl l="Create a new customer"}
+            dialog_body  = {$smarty.capture.customer_creation_dialog nofilter}
+
+            dialog_ok_label     = {intl l="Create this customer"}
+            dialog_cancel_label = {intl l="Cancel"}
+
+            form_action        = {url path='/admin/customer/create'}
+            form_enctype       = {form_enctype form=$form}
+            form_error_message = $form_error_message
+        }
+    {/form}
 
 {/block}
\ No newline at end of file