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 8538db3bc..fab49a20b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -4,7 +4,6 @@
          {{ $t('courselocation.title') }}
       </h2>
 
-      <!-- {# include vue_address component #} -->
       <div v-for="error in displayErrors" class="alert alert-danger my-2">
          {{ error }}
       </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
index 2c2da145f..811858f97 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
@@ -66,8 +66,8 @@
             {% if address.validTo is not empty and address.validTo < previousRowFrom %}
                 <div class="{{ 'row' ~ row ~ ' ' }}col-a action">
 
-                    {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                    {# include vue_address component #}
                     {#
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'person', id: person.id },
@@ -82,8 +82,8 @@
                 <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
                 <div class="{{ 'row' ~ row ~ ' ' }}col-c action">
 
-                    {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                    {# include vue_address component #}
                     {#
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'person', id: person.id },
@@ -115,7 +115,6 @@
                     }) }}
                     <ul class="record_actions">
 
-                        {# include vue_address component #}
                         <li><a href="{{ path('chill_person_address_edit', { 'person_id': person.id, 'address_id' : address.id } ) }}" class="btn btn-edit"></a></li>
 
                     </ul>
@@ -166,7 +165,6 @@
             </a>
         </li>
         <li>
-            {# include vue_address component #}
             <a class="btn btn-create"
                 href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}">
                 {{ 'Add an address'|trans }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
index 087e8be11..7f35b7ae9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
@@ -42,7 +42,6 @@
                 <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
                 <div class="{{ 'row' ~ row ~ ' ' }}col-c action">
 
-                    {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
 
                 <div class="date">
@@ -65,7 +64,6 @@
                 <ul class="record_actions">
                     <li>
 
-                        {# include vue_address component #}
                         <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}"
                            class="btn btn-edit"></a>
 
@@ -92,7 +90,6 @@
         </li>
         <li>
 
-            {# include vue_address component #}
             <a class="btn btn-create"
                 href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
                 {{ 'Move household'|trans }}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Address/_insert_vue_address.html.twig
deleted file mode 100644
index 379f71638..000000000
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ /dev/null
@@ -1,77 +0,0 @@
-{#
-    This Twig template include load vue_address component.
-    It push all variables from context in Address/App.vue.
-
-    OPTIONS
-    * mode          string ['edit*'|'new'|'create']
-    * address_id    integer
-    * backUrl       twig route:   path('route', {parameters})
-    * modalTitle    twig translated chain
-    * buttonText    twig translated chain
-    * buttonSize    bootstrap class like 'btn-sm'
-    * buttonDisplayText     bool
-    * binModalStep1         bool
-    * binModalStep2         bool
-
-#}
-<div id="address"></div>
-
-<script type="text/javascript">
-    window.vueRootComponent = 'app';
-
-    window.entityType = 'thirdParty';
-    window.entityId = {{ thirdParty.id|e('js') }};
-
-    {% 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 %}
-        window.backUrl = '{{ path('chill_3party_3party_show', { 'thirdparty_id': thirdParty.id })|e('js') }}';
-    {% else %}
-        window.backUrl = '{{ backUrl|e('js') }}';
-    {% endif %}
-
-    {% if modalTitle is defined %}
-        window.modalTitle = '{{ modalTitle|trans|e('js') }}';
-    {% endif %}
-
-
-    {% if buttonText is defined %}
-        window.buttonText = '{{ buttonText|trans|e('js') }}';
-    {% endif %}
-
-    {% if buttonSize is defined %}
-        window.buttonSize = '{{ buttonSize|e('js') }}';
-    {% endif %}
-
-    {% if buttonDisplayText is defined and buttonDisplayText == false %}
-        window.buttonDisplayText = false;
-    {% endif %}
-
-    {% if binModalStep1 is defined and binModalStep1 == false %}
-        window.binModalStep1 = false;
-    {% endif %}
-
-    {% if binModalStep2 is defined and binModalStep2 == false %}
-        window.binModalStep2 = false;
-    {% endif %}
-</script>
-
-{{ encore_entry_script_tags('vue_address') }}
-{{ encore_entry_link_tags('vue_address') }}
-
-{# TODO
-    * un seul fichier include twig qui fais la liaison avec vue_address
-        * dans main
-        * enlever les références à household, person, thirdparty
-    * addAddress
-        * option buttonText est buggée
-        * gestion du step1
-            *
-
-#}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
index 4fa9847c0..682764f7c 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
@@ -40,23 +40,25 @@
                     {% if thirdParty.address %}
                         edit address
                         {# include vue_address component #}
-                        {% include '@ChillThirdParty/Address/_insert_vue_address.html.twig' with {
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'thirdparty', id: thirdParty.id },
+                            backUrl: path('chill_3party_3party_new')
                             mode: 'edit',
-                            address_id: thirdParty.address.id,
+                            addressId: thirdParty.address.id,
                             buttonSize: 'btn-sm',
                             binModalStep1: false,
-                            backUrl: path('chill_3party_3party_new')
                         } %}
                     {% else %}
                         create address
                         {# include vue_address component #}
-                        {% include '@ChillThirdParty/Address/_insert_vue_address.html.twig' with {
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'thirdparty', id: thirdParty.id },
+                            backUrl: path('chill_3party_3party_new')
                             mode: 'create',
                             buttonSize: 'btn-sm',
                             buttonText: 'Create a new address',
                             modalTitle: 'Create a new address',
                             binModalStep1: false,
-                            backUrl: path('chill_3party_3party_new')
                         } %}
                     {% endif %}
                 </div>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index 340ecf15b..b2cc7f56d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -57,16 +57,20 @@
                     {% if thirdParty.address %}
                         edit address
                         {# include vue_address component #}
-                        {% include '@ChillThirdParty/Address/_insert_vue_address.html.twig' with {
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'thirdparty', id: thirdParty.id },
+                            backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty_id }),
                             mode: 'edit',
-                            address_id: thirdParty.address.id,
+                            addressId: thirdParty.address.id,
                             buttonSize: 'btn-sm',
                             binModalStep1: false
                         } %}
                     {% else %}
                         create address
                         {# include vue_address component #}
-                        {% include '@ChillThirdParty/Address/_insert_vue_address.html.twig' with {
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'thirdparty', id: thirdParty.id },
+                            backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty_id }),
                             mode: 'create',
                             buttonSize: 'btn-sm',
                             binModalStep1: false