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 248e7da2b..69f764284 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -9,8 +9,8 @@
    </button>
 
    <!-- step 1 -->
-   <teleport to="body" v-if="step1WithModal">
       <modal v-if="flag.showPane"
+   <teleport to="body" v-if="InModal">
          modalDialogClass="modal-dialog-scrollable modal-xl"
          @close="flag.showPane = false">
 
@@ -62,7 +62,7 @@
    </div>
 
    <!-- step 2 -->
-   <teleport to="body" v-if="step2WithModal">
+   <teleport to="body" v-if="InModal">
       <modal v-if="flag.editPane"
          modalDialogClass="modal-dialog-scrollable modal-xl"
          @close="flag.editPane = false">
@@ -147,10 +147,7 @@ export default {
                displayText: true
             },
             title: { create: 'add_an_address_title', edit: 'edit_address' },
-            bindModal: {
-               step1: true,
-               step2: true,
-            },
+            openPanesInModal: true,
             useDate: {
                validFrom: false,
                validTo: false
@@ -192,19 +189,9 @@ export default {
       }
    },
    computed: {
-      step1WithModal() {
-         return (typeof this.options.bindModal !== 'undefined' && typeof this.options.bindModal.step1 !== 'undefined') ?
-            this.options.bindModal.step1 : this.default.bindModal.step1;
-      },
-      step2WithModal() {
-         let step2 = (typeof this.options.bindModal !== 'undefined' && typeof this.options.bindModal.step2 !== 'undefined') ?
-            this.options.bindModal.step2 : this.default.bindModal.step2;
-
-         if (step2 === false && this.step1WithModal === true) {
-            console.log("step2 must open in a Modal");
-            return true;
-         }
-         return step2;
+      InModal() {
+         return (typeof this.options.openPanesInModal !== 'undefined') ?
+            this.options.openPanesInModal : this.default.openPanesInModal;
       },
       getTextTitle() {
          if ( typeof this.options.title !== 'undefined'
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index cb628586a..4e49b2207 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -38,12 +38,9 @@ containers.forEach((container) => {
                             create: container.dataset.modalTitle || null,
                             edit: container.dataset.modalTitle || null
                         },
-                        /// Display each step in page or Modal
-                        bindModal: {
-                            step1: container.dataset.bindModalStep1 !== 'false',  //boolean, default: true
-                            step2: container.dataset.bindModalStep2 !== 'false'   //boolean, default: true
-                        },
                         // Use Date fields
+                        /// Display panes in Modal for step123
+                        openPanesInModal: container.dataset.openPanesInModal !== 'false',  //boolean, default: true
                         useDate: {
                             validFrom: container.dataset.useValidFrom === 'true',  //boolean, default: false
                             validTo: container.dataset.useValidTo === 'true'       //boolean, default: false
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
index fa08286f8..052cdbec9 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -14,9 +14,8 @@
     * buttonText    twig translated chain
     * buttonSize    bootstrap class like 'btn-sm'
     * buttonDisplayText     bool
-    * bindModalStep1         bool
-    * bindModalStep2         bool
 
+    * openPanesInModal      bool (default: true)
 #}
 <div class="address-container"
 
@@ -51,13 +50,10 @@
         data-button-display-text="false"
     {% endif %}
 
-    {% if bindModalStep1 is defined and bindModalStep1 != 1 %}
-        data-bind-modal-step1="false"
+    {% if openPanesInModal is defined and openPanesInModal != 1 %}
+        data-open-panes-in-modal="false"
     {% endif %}
 
-    {% if bindModalStep2 is defined and bindModalStep2 != 1 %}
-        data-bind-modal-step2="false"
-    {% endif %}
 
     {% if useValidFrom is defined and useValidFrom == 1 %}
         data-use-valid-from="true"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index df2febe3f..a7638a5f1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -89,9 +89,7 @@ export default {
                   edit: 'courselocation.edit_temporary_address'
                },
                /// Display each step in page or Modal
-               bindModal: {
-                  //step1: false, step2: false
-               },
+               openPanesInModal: true,
                // Use Date fields
                useDate: {
                   validFrom: true
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
index 20713ec49..dd7679cc2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
@@ -30,8 +30,7 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
-            bindModalStep1: false,
-            bindModalStep2: false,
+            openPanesInModal: false,
         } %}
 
     {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
index ce68e4da8..205b9aab7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
@@ -74,8 +74,7 @@
                             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
                             mode: 'edit',
                             addressId: address.id,
-                            bindModalStep1: false,
-                            bindModalStep2: false,
+                            openPanesInModal: false,
                         } %}
                     #}
 
@@ -90,8 +89,7 @@
                             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
                             mode: 'edit',
                             addressId: address.id,
-                            bindModalStep1: false,
-                            bindModalStep2: false,
+                            openPanesInModal: false,
                         } %}
                     #}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index d3102fda5..53c785dda 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -30,8 +30,7 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
-            bindModalStep1: false,
-            bindModalStep2: false,
+            openPanesInModal: false,
             useValidFrom: true,
             useValidTo: 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 2bc2b6cd0..2bfedaee7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -10,8 +10,7 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-            bindModalStep1: false,
-            bindModalStep2: false,
+            openPanesInModal: false,
         } %}
     </div>
 
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 6d65c0a7f..2b7dfa8f0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -10,8 +10,7 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-            bindModalStep1: false,
-            bindModalStep2: false,
+            openPanesInModal: false,
         } %}
     </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index e8b0c7b78..d8c53dbf5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -40,8 +40,7 @@
                             buttonDisplayText: false,
                         } %}
                         {#
-                            bindModalStep1: false,
-                            bindModalStep2: true,
+                            openPanesInModal: false
                         #}
                     </li>
                     <li class="list-inline-item">