diff --git a/core/lib/Thelia/Controller/Admin/AddressController.php b/core/lib/Thelia/Controller/Admin/AddressController.php
index c6af8102c..38ec9cb6b 100644
--- a/core/lib/Thelia/Controller/Admin/AddressController.php
+++ b/core/lib/Thelia/Controller/Admin/AddressController.php
@@ -153,6 +153,8 @@ class AddressController extends AbstractCrudController
         $event =  $this->getCreateOrUpdateEvent($formData);
 
         $event->setAddress($this->getExistingObject());
+
+        return $event;
     }
 
     protected function getCreateOrUpdateEvent($formData)
diff --git a/templates/admin/default/customer-edit.html b/templates/admin/default/customer-edit.html
index b8c4138b3..69e1815f3 100644
--- a/templates/admin/default/customer-edit.html
+++ b/templates/admin/default/customer-edit.html
@@ -44,7 +44,7 @@
         						        	{/form_field}
 
         					            	{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
-
+                                            {loop name="address" type="address" customer="$customer_id" backend_context="1" default="true"}
                                             <div class="col-md-6">
                                                 <p class="title title-without-tabs">{intl l="Customer informations"}</p>
 
@@ -74,7 +74,7 @@
                                                     </div>
                                                 {/form_field}
 
-                                                {loop name="address" type="address" customer="$customer_id" backend_context="1" default="true"}
+
 
                                                     <p class="title title-without-tabs">{intl l="Default address"}</p>