diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 3c9ac64ff..54fa1a984 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -358,7 +358,7 @@ export default {
       },
 
       /*
-      *  When changes are validated (get out step2 edit pane),
+      *  When changes are validated (get out step2 edit pane, button valid),
       *  apply some transformations before asyncing with backend
       *  from entity.selected to entity.address
       */
@@ -494,7 +494,8 @@ export default {
       },
 
       /*
-      *  When submit address (get out step1 show pane)
+      *  When submit address
+      *  (get out step1 show pane, submit button)
       */
       submitAddress()
       {
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig
index 8174da969..2b7cc0701 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -28,6 +28,9 @@
     {% if 'edit' in app.request.get('_route') %}
         window.addressId = {{ app.request.get('address_id')|e('js') }};
         window.mode = 'edit';
+    {% elseif mode is defined and mode == 'edit' %}
+        window.addressId = {{ address_id|e('js') }};
+        window.mode = 'edit';
     {% endif %}
 
     {% if backUrl is not defined %}