diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 5e34aec39..6feb39185 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -37,7 +37,12 @@
         <default key="_controller">Thelia\Controller\Admin\CustomerController::indexAction</default>
     </route>
 
-    <route id="admin.customer.update.view" path="/admin/customer/update/{customer_id}">
+    <route id="admin.customer.update.view" path="/admin/customer/update/{customer_id}" methods="get">
+        <default key="_controller">Thelia\Controller\Admin\CustomerController::viewAction</default>
+        <requirement key="customer_id">\d+</requirement>
+    </route>
+
+    <route id="admin.customer.update.process" path="/admin/customer/update/{customer_id}" methods="post">
         <default key="_controller">Thelia\Controller\Admin\CustomerController::viewAction</default>
         <requirement key="customer_id">\d+</requirement>
     </route>
diff --git a/templates/admin/default/customer-edit.html b/templates/admin/default/customer-edit.html
index 216337927..48ccb3dc3 100644
--- a/templates/admin/default/customer-edit.html
+++ b/templates/admin/default/customer-edit.html
@@ -29,12 +29,15 @@
                                 <div class="col-md-12">
 
         						    {form name="thelia.customer.modification"}
-        						    	<form method="POST" action="{url path='/admin/customers/save'}" {form_enctype form=$form} class="clearfix">
+        						    	<form method="POST" action="{url path="/admin/customers/save/{$ID}"}" {form_enctype form=$form} class="clearfix">
 
-        	                                {* Be sure to get the customer ID, even if the form could not be validated *}
-        	                                <input type="hidden" name="customer_id" value="{$customer_id}" />
+                                            <div class="row inner-toolbar clearfix">
+                                                <div class="col-md-6 inner-actions pull-right">
+                                                    <button type="submit" name="save_mode" value="stay" class="btn btn-default btn-primary" title="{intl l='Save'}">{intl l='Save'} <span class="glyphicon glyphicon-ok"></span></button>
+                                                    <button type="submit" name="save_mode" value="close" class="btn btn-default btn-info" title="{intl l='Save and close'}">{intl l='Save and close'} <span class="glyphicon glyphicon-remove"></span></button>
+                                                </div>
+                                            </div>
 
-                                        	{include file="includes/inner-form-toolbar.html"}
 
         						        	{form_hidden_fields form=$form}