diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
similarity index 67%
rename from src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
index e235aae15..fabfc69cb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -3,8 +3,12 @@
     It push all variables from context in Address/App.vue.
 
     OPTIONS
-    * mode          string ['edit*'|'new'|'create']
-    * address_id    integer
+    * targetEntity  {
+          name:     string
+          id:       integer
+      }
+    * mode          string ['edit*'|'create']
+    * addressId     integer
     * backUrl       twig route:   path('route', {parameters})
     * modalTitle    twig translated chain
     * buttonText    twig translated chain
@@ -19,29 +23,18 @@
 <script type="text/javascript">
     window.vueRootComponent = 'app';
 
-    {% if person is defined %}
-        window.entityType = 'person';
-        window.entityId = {{ person.id|e('js') }};
-    {% elseif household is defined %}
-        window.entityType = 'household';
-        window.entityId = {{ household.id|e('js') }};
-    {% endif %}
+    window.entityType = '{{ targetEntity.name|e('js') }}';
+    window.entityId = '{{ targetEntity.id|e('js') }}';
 
     {% if 'edit' in app.request.get('_route') %}
+        window.mode = 'edit';
         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';
+        window.addressId = {{ addressId|e('js') }};
     {% endif %}
 
-    {% if backUrl is not defined %}
-        {% if person is defined %}
-            window.backUrl = '{{ path('chill_person_address_list', { 'person_id': person.id })|e('js') }}';
-        {% elseif household is defined %}
-            window.backUrl = '{{ path('chill_person_household_addresses', { 'household_id': household.id })|e('js') }}';
-        {% endif %}
-    {% else %}
+    {% if backUrl is defined %}
         window.backUrl = '{{ backUrl|e('js') }}';
     {% endif %}
 
@@ -49,7 +42,6 @@
         window.modalTitle = '{{ modalTitle|trans|e('js') }}';
     {% endif %}
 
-
     {% if buttonText is defined %}
         window.buttonText = '{{ buttonText|trans|e('js') }}';
     {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
index 50bc14171..954bbf348 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
@@ -27,7 +27,9 @@
         <h1>{{ block('title') }}</h1>
 
         {# include vue_address component #}
-        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+        {% 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 }),
             binModalStep1: false,
             binModalStep2: false,
         } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
index db136592f..2c2da145f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
@@ -29,8 +29,10 @@
         <li style="margin: auto;">
 
             {# include vue_address component #}
-            {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-                mode: 'new',
+            {% 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 }),
+                mode: 'create',
                 buttonSize: 'btn-lg',
                 buttonText: 'Add an address',
                 modalTitle: 'Add an address',
@@ -67,9 +69,11 @@
                     {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
                     {#
-                        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-                            address_id: address.id,
+                        {% 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 }),
                             mode: 'edit',
+                            addressId: address.id,
                             binModalStep1: false,
                             binModalStep2: false,
                         } %}
@@ -81,9 +85,11 @@
                     {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
                     {#
-                        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-                            address_id: address.id,
+                        {% 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 }),
                             mode: 'edit',
+                            addressId: address.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 3abd650f5..d5a55c760 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -27,7 +27,9 @@
         <h1>{{ block('title') }}</h1>
 
         {# include vue_address component #}
-        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+        {% 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 }),
             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 446cd769b..63ff0a041 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -7,7 +7,9 @@
 
     <div>
         {# include vue_address component #}
-        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+        {% 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 })
             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 b2da2097a..f744f5d9f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -7,7 +7,9 @@
 
     <div>
         {# include vue_address component #}
-        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+        {% 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 })
             binModalStep1: false,
             binModalStep2: false,
         } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
index 2acd68731..087e8be11 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
@@ -15,9 +15,10 @@
             <li style="margin: auto;">
 
                 {# include vue_address component #}
-                {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-                    mode: 'new',
-                    backUrl: chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }),
+                {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                    targetEntity: { name: 'household', id: household.id },
+                    backUrl: path('chill_person_household_address_move', { 'household_id': household.id }),
+                    mode: 'create',
                     buttonSize: 'btn-lg',
                     buttonText: 'Move household',
                     modalTitle: 'Move household',
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 9b553f0f0..faf9f13d6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -30,7 +30,9 @@
                 <ul class="list-inline text-right mt-2">
                     <li class="list-inline-item">
                         {# include vue_address component #}
-                        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+                        {% 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 }),
                             mode: 'create',
                             buttonSize: 'btn-sm',
                             buttonText: 'Move household',