diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index f89ccaa15..94042d446 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -63,9 +63,9 @@ export default {
                      create: window.buttonText || null,
                      edit: window.buttonText || null
                   },
-                  type: window.button.type || null,
-                  size: window.button.size || null,
-                  display: window.button.display   //boolean, default: true
+                  type: window.buttonType || null,
+                  size: window.buttonSize || null,
+                  display: window.buttonDisplay   //boolean, default: true
                },
 
                /// Modal title text if create or edit address (trans chain, see i18n)
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 fce848dfa..53c9ed0c0 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -226,7 +226,7 @@ export default {
    },
    mounted() {
       if (!this.step1WithModal) {
-         console.log('Mounted now !');
+         //console.log('Mounted now !');
          this.openShowPane();
       }
    },
@@ -499,7 +499,7 @@ export default {
       submitAddress()
       {
          let payload = {
-            entityId: this.context.entityId,
+            entityId: this.context.entity.id,
             addressId: this.entity.address.address_id,
             body: {
                validFrom: {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
index c464d92d5..2e6ec86a7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
@@ -31,7 +31,7 @@ export default {
    },
    computed: {
       sortedCountries() {
-         console.log('sorted countries');
+         //console.log('sorted countries');
          const countries = this.entity.loaded.countries;
          let sortedCountries = [];
          sortedCountries.push(...countries.filter(c => c.countryCode === 'FR'))
@@ -56,7 +56,7 @@ export default {
          return name.fr //TODO multilang
       },
       selectCountry(value) {
-         console.log('select country', value);
+         //console.log('select country', value);
          this.entity.selected.country = value;
          this.$emit('getCities', value);
       }
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 b2298e579..1e2e58ede 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
@@ -71,7 +71,7 @@
          <div v-if="flag.loading">
             {{ $t('loading') }}
          </div>
-         <div v-if="errorMsg.length > 0" class="alert alert-danger">
+         <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
             {{ errors }}
          </div>
          <div v-if="flag.success" class="alert alert-success">
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 aa7180b74..d0dae1ac8 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
@@ -44,21 +44,21 @@
         window.modalTitle = '{{ modalTitle|trans|e('js') }}';
     {% endif %}
 
-    window.button = {};
+
     {% if buttonText is defined %}
         window.buttonText = '{{ buttonText|trans|e('js') }}';
     {% endif %}
 
     {% if buttonType is defined %}
-        window.button.type = '{{ buttonType|e('js') }}';
+        window.buttonType = '{{ buttonType|e('js') }}';
     {% endif %}
 
     {% if buttonSize is defined %}
-        window.button.size = '{{ buttonSize|e('js') }}';
+        window.buttonSize = '{{ buttonSize|e('js') }}';
     {% endif %}
 
     {% if buttonDisplay is defined and buttonDisplay == false %}
-        window.button.display = false;
+        window.buttonDisplay = false;
     {% endif %}
 
     {% if binModalStep1 is defined and binModalStep1 == false %}