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 53c9ed0c0..da3719f27 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -259,7 +259,7 @@ export default {
       },
 
       closeEditPane() {
-         console.log('close the Edit Panel (with validation)');
+         console.log('close the Edit Panel');
          this.applyChanges();
          this.flag.showPane = true;
          this.flag.editPane = false;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
index 1e2e58ede..dc4bd65ca 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
@@ -68,9 +68,7 @@
                aria-describedby="validFrom"
             />
          </div>
-         <div v-if="flag.loading">
-            {{ $t('loading') }}
-         </div>
+         <!--div v-if="flag.loading">{{ $t('loading') }}</div-->
          <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
             {{ errors }}
          </div>
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 d0dae1ac8..8174da969 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
@@ -25,10 +25,10 @@
         window.entityId = {{ household.id|e('js') }};
     {% endif %}
 
-    {% if mode == 'edit' %}
-        window.addressId = {{ address_id|e('js') }};
+    {% if 'edit' in app.request.get('_route') %}
+        window.addressId = {{ app.request.get('address_id')|e('js') }};
+        window.mode = 'edit';
     {% endif %}
-    window.mode = '{{ mode|e('js') }}';
 
     {% if backUrl is not defined %}
         {% if person is defined %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
index bc527a899..50bc14171 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
@@ -28,8 +28,6 @@
 
         {# include vue_address component #}
         {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-            mode: 'edit',
-            address_id: person.lastAddress.id,
             binModalStep1: false,
             binModalStep2: false,
         } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index 55f3d8176..3abd650f5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -28,7 +28,6 @@
 
         {# include vue_address component #}
         {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-            mode: 'new',
             binModalStep1: false,
             binModalStep2: false,
         } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
index d48351c58..446cd769b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -8,8 +8,6 @@
     <div>
         {# include vue_address component #}
         {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-            mode: 'edit',
-            address_id: household.lastAddress.id,
             binModalStep1: false,
             binModalStep2: false,
         } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
index da3665d32..b2da2097a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -8,7 +8,6 @@
     <div>
         {# include vue_address component #}
         {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-            mode: 'new',
             binModalStep1: false,
             binModalStep2: false,
         } %}