diff --git a/docs/source/development/pagination.rst b/docs/source/development/pagination.rst
index c0cec9639..1a2c91ff0 100644
--- a/docs/source/development/pagination.rst
+++ b/docs/source/development/pagination.rst
@@ -28,7 +28,7 @@ Then, render the pagination using the dedicated twig function.
 
 .. code-block:: html+twig
 
-   {% extends "ChillPersonBundle::layout.html.twig"  %}
+   {% extends "@ChillPerson/Person/layout.html.twig"  %}
 
    {% block title 'Item list'|trans %}
 
diff --git a/docs/source/development/user-interface/layout-template-usage.rst b/docs/source/development/user-interface/layout-template-usage.rst
index 2b7a7764c..69848c650 100644
--- a/docs/source/development/user-interface/layout-template-usage.rst
+++ b/docs/source/development/user-interface/layout-template-usage.rst
@@ -149,7 +149,7 @@ It proposes a new block :
 
   * where to display the admin content
 
-ChillPersonBundle::layout.html.twig
+@ChillPersonBundle/Person/layout.html.twig
 -----------------------------------
 
 This layout extend `ChillMainBundle::layoutWithVerticalMenu.html.twig` add the person details in the block `top_banner`, set the menu `person` as the vertical menu.
diff --git a/src/Bundle/ChillMainBundle/Controller/SearchController.php b/src/Bundle/ChillMainBundle/Controller/SearchController.php
index 7c88d24fe..4ecc215f7 100644
--- a/src/Bundle/ChillMainBundle/Controller/SearchController.php
+++ b/src/Bundle/ChillMainBundle/Controller/SearchController.php
@@ -22,7 +22,9 @@
 
 namespace Chill\MainBundle\Controller;
 
+use Chill\MainBundle\Search\SearchApiNoQueryException;
 use Chill\MainBundle\Serializer\Model\Collection;
+use GuzzleHttp\Psr7\Response;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Chill\MainBundle\Search\UnknowSearchDomainException;
@@ -33,6 +35,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Chill\MainBundle\Search\SearchProvider;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Search\SearchApi;
@@ -46,15 +49,15 @@ use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 class SearchController extends AbstractController
 {
     protected SearchProvider $searchProvider;
-    
+
     protected TranslatorInterface $translator;
-    
+
     protected PaginatorFactory $paginatorFactory;
 
     protected SearchApi $searchApi;
-    
+
     function __construct(
-        SearchProvider $searchProvider, 
+        SearchProvider $searchProvider,
         TranslatorInterface $translator,
         PaginatorFactory $paginatorFactory,
         SearchApi $searchApi
@@ -65,14 +68,14 @@ class SearchController extends AbstractController
         $this->searchApi = $searchApi;
     }
 
-    
+
     public function searchAction(Request $request, $_format)
     {
         $pattern = $request->query->get('q', '');
-        
+
         if ($pattern === ''){
             switch($_format) {
-                case 'html': 
+                case 'html':
                     return $this->render('@ChillMain/Search/error.html.twig',
                           array(
                              'message' => $this->translator->trans("Your search is empty. "
@@ -86,16 +89,16 @@ class SearchController extends AbstractController
                     ]);
             }
         }
-        
+
         $name = $request->query->get('name', NULL);
-        
+
         try {
             if ($name === NULL) {
                 if ($_format === 'json') {
                     return new JsonResponse('Currently, we still do not aggregate results '
                         . 'from different providers', JsonResponse::HTTP_BAD_REQUEST);
                 }
-                
+
                 // no specific search selected. Rendering result in "preview" mode
                 $results = $this->searchProvider
                     ->getSearchResults(
@@ -119,7 +122,7 @@ class SearchController extends AbstractController
                                 ),
                             $_format
                             )];
-                
+
                 if ($_format === 'json') {
                     return new JsonResponse(\reset($results));
                 }
@@ -141,8 +144,8 @@ class SearchController extends AbstractController
                      'pattern' => $pattern
                   ));
         }
-        
-    
+
+
         return $this->render('@ChillMain/Search/list.html.twig',
               array('results' => $results, 'pattern' => $pattern)
               );
@@ -159,29 +162,33 @@ class SearchController extends AbstractController
                 ." one type");
         }
 
-        $collection = $this->searchApi->getResults($query, $types, []);
+        try {
+            $collection = $this->searchApi->getResults($query, $types, []);
+        } catch (SearchApiNoQueryException $e) {
+            throw new BadRequestHttpException($e->getMessage(), $e);
+        }
 
-        return $this->json($collection);
+        return $this->json($collection, \Symfony\Component\HttpFoundation\Response::HTTP_OK, [], [ "groups" =>  ["read"]]);
     }
-    
+
     public function advancedSearchListAction(Request $request)
     {
         /* @var $variable Chill\MainBundle\Search\SearchProvider */
         $searchProvider = $this->searchProvider;
         $advancedSearchProviders = $searchProvider
             ->getHasAdvancedFormSearchServices();
-        
+
         if(\count($advancedSearchProviders) === 1) {
             \reset($advancedSearchProviders);
-            
+
             return $this->redirectToRoute('chill_main_advanced_search', [
                 'name' => \key($advancedSearchProviders)
             ]);
         }
-        
+
         return $this->render('@ChillMain/Search/choose_list.html.twig');
     }
-    
+
     public function advancedSearchAction($name, Request $request)
     {
         try {
@@ -190,22 +197,22 @@ class SearchController extends AbstractController
             /* @var $variable Chill\MainBundle\Search\HasAdvancedSearchFormInterface */
             $search = $this->searchProvider
                         ->getHasAdvancedFormByName($name);
-        
+
         } catch (\Chill\MainBundle\Search\UnknowSearchNameException $e) {
             throw $this->createNotFoundException("no advanced search for "
                 . "$name");
         }
-        
+
         if ($request->query->has('q')) {
             $data = $search->convertTermsToFormData($searchProvider->parse(
                 $request->query->get('q')));
         }
-        
+
         $form = $this->createAdvancedSearchForm($name, $data ?? []);
-        
+
         if ($request->isMethod(Request::METHOD_POST)) {
             $form->handleRequest($request);
-            
+
             if ($form->isValid()) {
                 $pattern = $this->searchProvider
                     ->getHasAdvancedFormByName($name)
@@ -215,8 +222,8 @@ class SearchController extends AbstractController
                     'q' => $pattern, 'name' => $name
                 ]);
             }
-        } 
-        
+        }
+
         return $this->render('@ChillMain/Search/advanced_search.html.twig',
             [
                 'form' => $form->createView(),
@@ -224,15 +231,15 @@ class SearchController extends AbstractController
                 'title' => $search->getAdvancedSearchTitle()
             ]);
     }
-    
+
     protected function createAdvancedSearchForm($name, array $data = [])
     {
         $builder = $this
             ->get('form.factory')
             ->createNamedBuilder(
                 null,
-                FormType::class, 
-                $data, 
+                FormType::class,
+                $data,
                 [ 'method' => Request::METHOD_POST ]
             );
 
@@ -240,12 +247,12 @@ class SearchController extends AbstractController
             ->getHasAdvancedFormByName($name)
             ->buildForm($builder)
             ;
-        
+
         $builder->add('submit', SubmitType::class, [
             'label' => 'Search'
         ]);
-        
+
         return $builder->getForm();
     }
-    
+
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
index 20ce571ac..1d7cd5db8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -265,6 +265,17 @@ table.table-bordered {
    }
 }
 
+div.metadata {
+   font-size: smaller;
+   color: $gray-600;
+   span.user, span.date {
+      text-decoration: underline dotted;
+      &:hover {
+         color: $gray-700;
+      }
+   }
+}
+
 /// display definition list
 //  with dt and dd on same line
 
@@ -283,7 +294,6 @@ dl.definition-inline {
    }
 }
 
-
 /// when there is no data
 .custom_field_no_data,
 .chill-no-data-statement {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss
index efedac51d..bdb3c60a6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss
@@ -43,6 +43,7 @@ ul.record_actions {
    display: flex;
    padding: 0.8em 1.6em;
    border-radius: 0;
+   z-index: 1000;
 }
 
 /// EXCEPTIONS
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
index 68bbe2afc..31d2c8d09 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
@@ -93,9 +93,10 @@ section.chill-entity {
             font-style: italic;
         }
 
-        span.address-valid {
-            &.address-since {}
-            &.address-until {}
+        .address-valid {
+            margin-top: 2em;
+            &.date-since {}
+            &.date-until {}
         }
     }
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 72b46c3ab..0ae6fc578 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -1,147 +1,86 @@
 <template>
-   <div class="chill-entity entity-address">
 
-      <h2 v-if="!edit">{{ $t('create_a_new_address') }}</h2>
-      <h2 v-else>{{ $t('edit_address') }}</h2>
-
-      <show-address
-         v-if="address"
-         v-bind:address="address">
-      </show-address>
-
-      <add-address
-         @addNewAddress="addNewAddress">
-      </add-address>
+   <div v-for="error in displayErrors" class="alert alert-danger my-2">
+      {{ error }}
    </div>
 
-   <div v-if="!edit" class='person-address__valid'>
-      <h2>{{ $t('date') }}</h2>
-
-      <div class="input-group mb-3">
-         <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
-         <input type="date" class="form-control form-control-lg" name="validFrom"
-            v-bind:placeholder="$t('validFrom')"
-            v-model="validFrom"
-            aria-describedby="validFrom" />
-      </div>
-
-      <div v-if="errors.length > 0">
-         {{ errors }}
-      </div>
-      <div v-if="loading">
-            {{ $t('loading') }}
-      </div>
-      <div v-if="success">
-            {{ $t('person_address_creation_success') }}
-      </div>
-   </div>
-
-   <ul class="record_actions sticky-form-buttons">
-      <li class="cancel">
-         <a :href="backUrl" class="btn btn-cancel">{{ $t('back_to_the_list') }}</a>
-      </li>
-      <li v-if="!edit">
-         <button type="submit" class="btn btn-update" @click="addToPerson">
-            {{ $t('add_an_address_to_person') }}
-         </button>
-      </li>
-   </ul>
+   <add-address
+      v-bind:key="context.entity.type"
+      v-bind:context="context"
+      v-bind:options="addAddress.options"
+      v-bind:result="addAddress.result"
+      @submitAddress="submitAddress"
+      ref="addAddress">
+   </add-address>
 </template>
 
 <script>
+/*
+*  Address component is a uniq component for many contexts.
+*  Allow to create/attach/edit an address to
+*  - a person (new or edit address),
+*  - a household (move or edit address)
+*
+* */
 import AddAddress from './components/AddAddress.vue';
-import ShowAddress from './components/ShowAddress.vue';
 
 export default {
-   name: 'App',
+   name: "App",
    components: {
-      AddAddress,
-      ShowAddress
+      AddAddress
    },
    data() {
       return {
-         edit: window.mode === 'edit',
-         personId: window.personId,
-         addressId: window.addressId,
-         backUrl: `/fr/person/${window.personId}/address/list`, //TODO better way to pass this
-         validFrom: new Date().toISOString().split('T')[0]
-      }
-   },
-   computed: {
-      address() {
-         return this.$store.state.address;
-      },
-      errors() {
-         return this.$store.state.errorMsg;
-      },
-      loading() {
-         return this.$store.state.loading;
-      },
-      success() {
-         return this.$store.state.success;
+         context: {
+            edit: window.mode === 'edit',
+            entity: {
+               type: window.entityType,
+               id: window.entityId
+            },
+            addressId: window.addressId | null,
+            backUrl: window.backUrl,
+         },
+         addAddress: {
+            options: {
+
+               /// Options override default.
+               /// null value take default component value defined in AddAddress data()
+               button: {
+                  text:  {
+                     create: window.buttonText || null,
+                     edit: window.buttonText || null
+                  },
+                  size: window.buttonSize || null,
+                  displayText: window.buttonDisplayText   //boolean, default: true
+               },
+
+               /// Modal title text if create or edit address (trans chain, see i18n)
+               title: {
+                  create: window.modalTitle || null,
+                  edit: window.modalTitle || null
+               },
+
+               /// Display each step in page or Modal
+               bindModal: {
+                  step1: window.binModalStep1,  //boolean, default: true
+                  step2: window.binModalStep2   //boolean, default: true
+               }
+            }
+         }
       }
    },
    methods: {
-      addNewAddress({ address, modal }) {
-         console.log('@@@ CLICK button addNewAdress', address);
-
-         let newAddress = {
-            'isNoAddress': address.isNoAddress,
-            'street': address.isNoAddress ? '' : address.street,
-            'streetNumber': address.isNoAddress ? '' : address.streetNumber,
-            'postcode': {'id': address.selected.city.id},
-            'floor': address.floor,
-            'corridor': address.corridor,
-            'steps': address.steps,
-            'flat': address.flat,
-            'buildingName': address.buildingName,
-            'distribution': address.distribution,
-            'extra': address.extra
-         };
-
-         if (address.selected.address.point !== undefined){
-            newAddress = Object.assign(newAddress, {
-               'point': address.selected.address.point.coordinates
-            });
-         }
-
-         if (address.writeNewPostalCode){
-            let newPostalCode = address.newPostalCode;
-            newPostalCode = Object.assign(newPostalCode, {
-                'country': {'id': address.selected.country.id },
-            });
-            newAddress = Object.assign(newAddress, {
-               'newPostalCode': newPostalCode
-            });
-         }
-
-         if (this.edit){
-            this.$store.dispatch('updateAddress', {
-               addressId: this.addressId,
-               newAddress: newAddress
-            });
-         } else {
-            this.$store.dispatch('addAddress', newAddress);
-         }
-
-         modal.showModal = false;
+      displayErrors() {
+         return this.$refs.addAddress.errorMsg;
       },
-      addToPerson() {
-         this.$store.dispatch('addDateToAddressAndAddressToPerson', {
-            personId: this.personId,
-            addressId: this.$store.state.address.address_id,
-            body: { validFrom: {datetime: `${this.validFrom}T00:00:00+0100`}},
-            backUrl: this.backUrl
-         })
-      },
-      getEditAddress() {
-         this.$store.dispatch('getEditAddress', this.addressId);
+      submitAddress() {
+         console.log('@@@ click on Submit Address Button');
+
+         // Cast child method
+         this.$refs.addAddress.submitNewAddress();
+         // it fetch post request only for person and household
+         // else get returned payload then dispatch from here (parent)
       }
-   },
-   mounted() {
-      if (this.edit) {
-         this.getEditAddress();
-      }
-   },
-};
+   }
+}
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
index 0f078a2d9..e4ed78f35 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
@@ -4,7 +4,7 @@
 * @returns {Promise} a promise containing all Country object
 */
 const fetchCountries = () => {
-   console.log('<<< fetching countries');
+   //console.log('<<< fetching countries');
 
    const url = `/api/1.0/main/country.json?item_per_page=1000`;
    return fetch(url)
@@ -20,7 +20,7 @@ const fetchCountries = () => {
 * @returns {Promise} a promise containing all Postal Code objects filtered with country
 */
 const fetchCities = (country) => {
-   console.log('<<< fetching cities for', country);
+   //console.log('<<< fetching cities for', country);
    const url = `/api/1.0/main/postal-code.json?item_per_page=1000&country=${country.id}`;
    return fetch(url)
       .then(response => {
@@ -35,7 +35,7 @@ const fetchCities = (country) => {
 * @returns {Promise} a promise containing all AddressReference objects filtered with postal code
 */
 const fetchReferenceAddresses = (postalCode) => {
-    console.log('<<< fetching references addresses for', postalCode);
+    //console.log('<<< fetching references addresses for', postalCode);
     const url = `/api/1.0/main/address-reference.json?item_per_page=1000&postal_code=${postalCode.id}`;
     return fetch(url)
        .then(response => {
@@ -50,7 +50,7 @@ const fetchReferenceAddresses = (postalCode) => {
 * @returns {Promise} a promise containing all AddressReference objects filtered with postal code
 */
 const fetchAddresses = () => {
-   console.log('<<< fetching addresses');
+   //console.log('<<< fetching addresses');
   //TODO deal with huge number of addresses... we should do suggestion...
    const url = `/api/1.0/main/address.json?item_per_page=1000`;
    return fetch(url)
@@ -125,31 +125,6 @@ const postPostalCode = (postalCode) => {
    });
 };
 
-/*
-* Endpoint chill_api_single_person_address
-* method POST, post Person instance
-*
-*  @id     integer - id of Person
-*  @body   Object - dictionary with changes to post
-*/
-const postAddressToPerson = (personId, addressId) => {
-   console.log(personId);
-   console.log(addressId);
-   const body = {
-      'id': addressId
-   };
-   const url = `/api/1.0/person/person/${personId}/address.json`
-   return fetch(url, {
-         method: 'POST',
-         headers: {'Content-Type': 'application/json;charset=utf-8'},
-         body: JSON.stringify(body)
-      })
-      .then(response => {
-         if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response');
-      });
-};
-
 /*
 * Endpoint chill_api_single_address__index
 * method GET, get Address Object
@@ -157,7 +132,7 @@ const postAddressToPerson = (personId, addressId) => {
 * @returns {Promise} a promise containing a Address object
 */
 const getAddress = (id) => {
-   console.log('<<< get address');
+   //console.log('<< get address');
    const url = `/api/1.0/main/address/${id}.json`;
    return fetch(url)
       .then(response => {
@@ -174,6 +149,5 @@ export {
    postAddress,
    patchAddress,
    postPostalCode,
-   postAddressToPerson,
    getAddress
 };
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 ead092802..fa4ff4773 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -1,273 +1,618 @@
 <template>
-   <button v-if="!edit" class="btn btn-create mt-4" @click="openModal">
-      {{ $t('add_an_address_title') }}
-   </button>
-   <button v-else class="btn btn-create mt-4" @click="openModal">
-      {{ $t('edit_address') }}
+
+   <!-- start with a button -->
+   <button v-if="step1WithModal"
+      @click="openShowPane"
+      class="btn" :class="getClassButton"
+      type="button" name="button" :title="$t(getTextButton)">
+      <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
    </button>
 
-   <teleport to="body">
-      <modal v-if="modal.showModal"
-         v-bind:modalDialogClass="modal.modalDialogClass"
-         @close="modal.showModal = false">
+   <!-- step 1 -->
+   <teleport to="body" v-if="step1WithModal">
+      <modal v-if="flag.showPane"
+         modalDialogClass="modal-dialog-scrollable modal-xl"
+         @close="flag.showPane = false">
 
          <template v-slot:header>
-            <h3 v-if="!edit" class="modal-title">{{ $t('add_an_address_title') }}</h3>
-            <h3 v-if="edit" class="modal-title">{{ $t('edit_an_address_title') }}</h3>
+            <h2 class="modal-title">{{ $t(getTextTitle) }}
+               <span v-if="flag.loading" class="loading">
+                  <i class="fa fa-circle-o-notch fa-spin fa-fw"></i>
+                  <span class="sr-only">{{ $t('loading') }}</span>
+               </span>
+            </h2>
          </template>
 
          <template v-slot:body>
-            <div class="address-form">
-
-               <h4 class="h3">{{ $t('select_an_address_title') }}
-                  <span v-if="loading">
-                     <i class="fa fa-circle-o-notch fa-spin fa-lg"></i>
-                  </span>
-               </h4>
-
-               <div class="row my-3">
-                  <div class="col-lg-6">
-
-                     <div class="form-check">
-                        <input type="checkbox"
-                           class="form-check-input"
-                           id="isNoAddress"
-                           v-model="isNoAddress"
-                           v-bind:value="value" />
-                        <label class="form-check-label" for="isNoAddress">
-                           {{ $t('isNoAddress') }}
-                        </label>
-                     </div>
-
-                     <country-selection
-                        v-bind:address="address"
-                        v-bind:getCities="getCities">
-                     </country-selection>
-
-                     <city-selection
-                        v-bind:address="address"
-                        v-bind:focusOnAddress="focusOnAddress"
-                        v-bind:getReferenceAddresses="getReferenceAddresses">
-                     </city-selection>
-
-                     <address-selection
-                        v-if="!isNoAddress"
-                        v-bind:address="address"
-                        v-bind:updateMapCenter="updateMapCenter">
-                     </address-selection>
-
-                  </div>
-                  <div class="col-lg-6 mt-3 mt-lg-0">
-
-                     <address-map
-                        v-bind:address="address"
-                        ref="addressMap">
-                     </address-map>
-
-                  </div>
-               </div>
-
-               <address-more
-                  v-if="!isNoAddress"
-                  v-bind:address="address">
-               </address-more>
-
-            </div>
+            <show-address-pane
+               v-bind:context="this.context"
+               v-bind:options="this.options"
+               v-bind:default="this.default"
+               v-bind:entity="this.entity"
+               v-bind:valid="this.valid"
+               v-bind:flag="this.flag"
+               ref="showAddress">
+            </show-address-pane>
          </template>
 
          <template v-slot:footer>
-            <button class="btn btn-create"
-               @click.prevent="$emit('addNewAddress', { address, modal })">
-               {{ $t('action.add')}}
+            <button @click="openEditPane"
+               class="btn btn-update">
+               {{ $t('action.edit')}}
+            </button>
+            <button class="btn btn-save"
+               @click.prevent="$emit('submitAddress')">
+               {{ $t('action.save')}}
             </button>
          </template>
 
       </modal>
    </teleport>
+   <div class="mt-4" v-else>
+
+      <show-address-pane v-if="flag.showPane"
+         v-bind:context="this.context"
+         v-bind:options="this.options"
+         v-bind:default="this.default"
+         v-bind:entity="this.entity"
+         v-bind:valid="this.valid"
+         v-bind:flag="this.flag"
+         ref="showAddress"
+         v-bind:insideModal="false" @openEditPane="openEditPane"
+         @submitAddress="$emit('submitAddress')">
+      </show-address-pane>
+   </div>
+
+   <!-- step 2 -->
+   <teleport to="body" v-if="step2WithModal">
+      <modal v-if="flag.editPane"
+         modalDialogClass="modal-dialog-scrollable modal-xl"
+         @close="flag.editPane = false">
+
+         <template v-slot:header>
+            <h2 class="modal-title">{{ $t(getTextTitle) }}
+               <span v-if="flag.loading" class="loading">
+                  <i class="fa fa-circle-o-notch fa-spin fa-fw"></i>
+                  <span class="sr-only">{{ $t('loading') }}</span>
+               </span>
+            </h2>
+         </template>
+
+         <template v-slot:body>
+            <edit-address-pane
+               v-bind:context="this.context"
+               v-bind:options="this.options"
+               v-bind:default="this.default"
+               v-bind:entity="this.entity"
+               v-bind:flag="this.flag"
+               @getCities="getCities"
+               @getReferenceAddresses="getReferenceAddresses">
+            </edit-address-pane>
+         </template>
+
+         <template v-slot:footer>
+            <button class="btn btn-cancel change-icon" @click="flag.showPane = true; flag.editPane = false;">
+               {{ $t('action.cancel') }}
+            </button>
+            <button class="btn btn-update"
+               @click="closeEditPane">
+               {{ $t('action.valid')}}
+            </button>
+         </template>
+
+      </modal>
+   </teleport>
+   <div class="mt-4" v-else>
+
+      <edit-address-pane v-if="flag.editPane"
+         v-bind:context="this.context"
+         v-bind:options="this.options"
+         v-bind:default="this.default"
+         v-bind:entity="this.entity"
+         v-bind:flag="this.flag"
+         v-bind:insideModal="false" @closeEditPane="closeEditPane"
+         @getCities="getCities"
+         @getReferenceAddresses="getReferenceAddresses">
+      </edit-address-pane>
+   </div>
+
 </template>
 
 <script>
 import Modal from 'ChillMainAssets/vuejs/_components/Modal';
-import { fetchCountries, fetchCities, fetchReferenceAddresses } from '../api'
-
-import CountrySelection from './AddAddress/CountrySelection';
-import CitySelection from './AddAddress/CitySelection';
-import AddressSelection from './AddAddress/AddressSelection';
-import AddressMap from './AddAddress/AddressMap';
-import AddressMore from './AddAddress/AddressMore'
+import { getAddress, fetchCountries, fetchCities, fetchReferenceAddresses, patchAddress, postAddress, postPostalCode } from '../api';
+import { postAddressToPerson, postAddressToHousehold } from "ChillPersonAssets/vuejs/_api/AddAddress.js";
+import ShowAddressPane from './ShowAddressPane.vue';
+import EditAddressPane from './EditAddressPane.vue';
 
 export default {
-   name: 'AddAddresses',
+   name: "AddAddress",
+   props: ['context', 'options', 'result'],
+   emits: ['submitAddress'],
    components: {
       Modal,
-      CountrySelection,
-      CitySelection,
-      AddressSelection,
-      AddressMap,
-      AddressMore
+      ShowAddressPane,
+      EditAddressPane,
    },
-   props: [
-   ],
-   emits: ['addNewAddress'],
    data() {
       return {
-         edit: window.mode === 'edit',
-         modal: {
-            showModal: false,
-            modalDialogClass: "modal-dialog-scrollable modal-xl"
+         flag: {
+            showPane: false,
+            editPane: false,
+            loading: false,
+            success: false
          },
-         loading: false,
-         address: {
-            writeNewAddress: false,
-            writeNewPostalCode: false,
+         default: {
+            button: {
+               text: { create: 'add_an_address_title', edit: 'edit_address' },
+               type: { create: 'btn-create', edit: 'btn-update'},
+               displayText: true
+            },
+            title: { create: 'add_an_address_title', edit: 'edit_address' },
+            bindModal: {
+               step1: true,
+               step2: true,
+            },
+         },
+         entity: {
+            address: {}, // <== loaded and returned
             loaded: {
                countries: [],
                cities: [],
                addresses: [],
             },
-            selected: {
+            selected: {  // <== make temporary changes
+               isNoAddress: false,
                country: {},
                city: {},
+               postcode: {
+                  code: null,
+                  name: null
+               },
                address: {},
-            },
-            newPostalCode: {
-               code: null,
-               name: null
+               writeNew: {
+                  address: false,
+                  postcode: false
+               }
             },
             addressMap: {
-               center : [48.8589, 2.3469], // Note: LeafletJs demands [lat, lon] cfr https://macwright.com/lonlat/
+               // Note: LeafletJs demands [lat, lon]
+               // cfr https://macwright.com/lonlat/
+               center : [48.8589, 2.3469],
                zoom: 12
             },
-            isNoAddress: false,
-            street: null,
-            streetNumber: null,
-            floor: null,
-            corridor: null,
-            steps: null,
-            floor: null,
-            flat: null,
-            buildingName: null,
-            extra: null,
-            distribution: null,
          },
-         errorMsg: {},
+         valid: {
+            from: new Date(),
+            to: null
+         },
+         errorMsg: []
       }
    },
    computed: {
-      isNoAddress: {
-         set(value) {
-            console.log('value', value);
-            this.address.isNoAddress = value;
-         },
-         get() {
-            return this.address.isNoAddress;
+      step1WithModal() {
+         return (this.options.bindModal !== null && typeof this.options.bindModal.step1 !== 'undefined') ?
+            this.options.bindModal.step1 : this.default.bindModal.step1;
+      },
+      step2WithModal() {
+         let step2 = (this.options.bindModal !== null && 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;
+      },
+      getTextTitle() {
+         if ( typeof this.options.title !== 'undefined'
+            && ( this.options.title.edit !== null
+               || this.options.title.create !== null
+            )) {
+            return (this.context.edit) ? this.options.title.edit : this.options.title.create;
+         }
+         return (this.context.edit) ? this.default.title.edit : this.default.title.create;
+      },
+      getTextButton() {
+         if ( typeof this.options.button.text !== 'undefined'
+            && ( this.options.button.text.edit !== null
+               || this.options.button.text.create !== null
+            )) {
+            return (this.context.edit) ? this.options.button.text.edit : this.options.button.text.create;
+         }
+         return (this.context.edit) ? this.default.button.text.edit : this.default.button.text.create;
+      },
+      getClassButton() {
+         let type = (this.context.edit) ? this.default.button.type.edit : this.default.button.type.create;
+         let size = (typeof this.options.button !== 'undefined' && this.options.button.size !== null) ?
+            `${this.options.button.size} ` : '';
+         return `${size}${type}`;
+      },
+      displayTextButton() {
+         return (typeof this.options.button !== 'undefined' && typeof this.options.button.displayText !== 'undefined') ?
+            this.options.button.displayText : this.default.button.displayText;
+      },
+      context() {
+         return this.context;
       }
    },
    mounted() {
-       this.getCountries();
+      if (!this.step1WithModal) {
+         //console.log('Mounted now !');
+         this.openShowPane();
+      }
    },
    methods: {
-      openModal() {
-         this.modal.showModal = true;
-         this.resetAll();
-         //this.$nextTick(function() {
-         //   this.$refs.search.focus(); // positionner le curseur à l'ouverture de la modale
-         //})
+
+      /*
+      *  Opening and closing Panes when interacting with buttons
+      */
+      openShowPane() {
+         console.log('open the Show Panel');
+
+         if (this.context.edit) {
+            this.getInitialAddress(this.context.addressId);
+         }
+
+         // when create new address, start first with editPane
+         if ( this.context.edit === false
+            && this.flag.editPane === false
+         ) {
+            this.openEditPane();
+            this.flag.editPane = true;
+
+         } else {
+            this.flag.showPane = true;
+         }
       },
-      focusOnCity() {
-          const citySelector = document.getElementById('citySelector');
-          citySelector.focus();
+
+      openEditPane() {
+         console.log('open the Edit panel');
+         this.initForm();
+         this.getCountries();
       },
-      focusOnAddress() {
-          const addressSelector = document.getElementById('addressSelector');
-          addressSelector.focus();
+
+      closeEditPane() {
+         console.log('close the Edit Panel');
+         this.applyChanges();
+         this.flag.showPane = true;
+         this.flag.editPane = false;
       },
-      getCountries() {
-         console.log('getCountries');
-         this.loading = true;
-         fetchCountries().then(countries => new Promise((resolve, reject) => {
-             this.address.loaded.countries = countries.results;
-             resolve()
-             this.loading = false;
-          }))
-          .catch((error) => {
-             this.errorMsg.push(error.message);
-             this.loading = false;
-          });
-      },
-      getCities(country) {
-         console.log('getCities for', country.name);
-         this.loading = true;
-         fetchCities(country).then(cities => new Promise((resolve, reject) => {
-            this.address.loaded.cities = cities.results.filter(c => c.origin !== 3); // filter out user-defined cities
-            resolve();
-            this.loading = false;
+
+      /*
+      *  Async Fetch datas
+      */
+      getInitialAddress(id) {
+         this.flag.loading = true;
+         getAddress(id).then(
+            address => new Promise((resolve, reject) => {
+               this.entity.address = address;
+               this.flag.loading = false;
+               resolve();
          }))
          .catch((error) => {
             this.errorMsg.push(error.message);
-            this.loading = false;
+            this.flag.loading = false;
          });
       },
-      getReferenceAddresses(city) {
-         this.loading = true;
-         console.log('getReferenceAddresses for', city.name);
-         fetchReferenceAddresses(city).then(addresses => new Promise((resolve, reject) => {
-               console.log('addresses', addresses);
-               this.address.loaded.addresses = addresses.results;
+
+      getCountries() {
+         this.flag.loading = true;
+         fetchCountries().then(
+            countries => new Promise((resolve, reject) => {
+               this.entity.loaded.countries = countries.results;
+               this.flag.showPane = false;
+               this.flag.editPane = true;
+               this.flag.loading = false;
+               resolve()
+         }))
+         .catch((error) => {
+            this.errorMsg.push(error.message);
+            this.flag.loading = false;
+         });
+      },
+
+      getCities(country) {
+         this.flag.loading = true;
+         fetchCities(country).then(
+            cities => new Promise((resolve, reject) => {
+               this.entity.loaded.cities = cities.results.filter(c => c.origin !== 3); // filter out user-defined cities
+               this.flag.loading = false;
                resolve();
-               this.loading = false;
-            }))
+         }))
+         .catch((error) => {
+            this.errorMsg.push(error.message);
+            this.flag.loading = false;
+         });
+      },
+
+      getReferenceAddresses(city) {
+         this.flag.loading = true;
+         fetchReferenceAddresses(city).then(
+            addresses => new Promise((resolve, reject) => {
+               this.entity.loaded.addresses = addresses.results;
+               this.flag.loading = false;
+               resolve();
+         }))
+         .catch((error) => {
+            this.errorMsg.push(error.message);
+            this.flag.loading = false;
+         });
+      },
+
+      /*
+      *   Make form ready for new changes
+      */
+      initForm() {
+         console.log('init form');
+
+         this.entity.loaded.addresses = [];
+         this.entity.loaded.cities = [];
+         this.entity.loaded.countries = [];
+
+         this.entity.selected.isNoAddress = (this.context.edit && this.entity.address.text === '') ? true : false;
+
+         this.entity.selected.country = this.context.edit ? this.entity.address.country : {};
+         this.entity.selected.postcode = this.context.edit ? this.entity.address.postcode : {};
+         this.entity.selected.city = {};
+
+         this.entity.selected.address = {};
+         this.entity.selected.address.street = this.context.edit ? this.entity.address.street: null;
+         this.entity.selected.address.streetNumber = this.context.edit ? this.entity.address.streetNumber: null;
+         this.entity.selected.address.floor = this.context.edit ? this.entity.address.floor: null;
+         this.entity.selected.address.corridor = this.context.edit ? this.entity.address.corridor: null;
+         this.entity.selected.address.steps = this.context.edit ? this.entity.address.steps: null;
+         this.entity.selected.address.flat = this.context.edit ? this.entity.address.flat: null;
+         this.entity.selected.address.buildingName = this.context.edit ? this.entity.address.buildingName: null;
+         this.entity.selected.address.distribution = this.context.edit ? this.entity.address.distribution: null;
+         this.entity.selected.address.extra = this.context.edit ? this.entity.address.extra: null;
+
+         this.entity.selected.writeNew.address = this.context.edit;
+         this.entity.selected.writeNew.postcode = this.context.edit;
+      },
+
+      /*
+      *  When changes are validated (get out step2 edit pane, button valid),
+      *  apply some transformations before asyncing with backend
+      *  from entity.selected to entity.address
+      */
+      applyChanges()
+      {
+         let newAddress = {
+            'isNoAddress': this.entity.selected.isNoAddress,
+            'street': this.entity.selected.isNoAddress ? '' : this.entity.selected.address.street,
+            'streetNumber': this.entity.selected.isNoAddress ? '' : this.entity.selected.address.streetNumber,
+            'postcode': {'id': this.entity.selected.city.id },
+            'floor': this.entity.selected.address.floor,
+            'corridor': this.entity.selected.address.corridor,
+            'steps': this.entity.selected.address.steps,
+            'flat': this.entity.selected.address.flat,
+            'buildingName': this.entity.selected.address.buildingName,
+            'distribution': this.entity.selected.address.distribution,
+            'extra': this.entity.selected.address.extra
+         };
+
+         if (this.entity.selected.address.point !== undefined) {
+            newAddress = Object.assign(newAddress, {
+               'point': this.entity.selected.address.point.coordinates
+            });
+         }
+         if (this.entity.selected.writeNew.postcode) {
+            let newPostcode = this.entity.selected.postcode;
+            newPostcode = Object.assign(newPostcode, {
+               'country': {'id': this.entity.selected.country.id },
+            });
+            newAddress = Object.assign(newAddress, {
+               'newPostcode': newPostcode
+            });
+         }
+
+         if (this.context.edit) {
+            this.updateAddress({
+               addressId: this.context.addressId,
+               newAddress: newAddress
+            });
+         } else {
+            this.addAddress(newAddress);
+         }
+      },
+
+      /*
+      *  Async POST transactions,
+      *  creating new address, and receive backend datas when promise is resolved
+      */
+      addAddress(payload)
+      {
+         this.flag.loading = true;
+         if ('newPostcode' in payload) {
+
+            let postcodeBody = payload.newPostcode;
+            if (this.context.entity.type === 'person') {
+               postcodeBody = Object.assign(postcodeBody, {'origin': 3});
+            }
+
+            postPostalCode(postcodeBody)
+               .then(postalCode => {
+                  let body = payload;
+                  body.postcode = {'id': postalCode.id },
+                     postAddress(body)
+                        .then(address => new Promise((resolve, reject) => {
+                           this.entity.address = address;
+                           this.flag.loading = false;
+                           this.flag.success = true;
+                           resolve();
+                        }))
+                        .catch((error) => {
+                           this.errorMsg.push(error);
+                           this.flag.loading = false;
+                        });
+               })
+
+         } else {
+            postAddress(payload)
+               .then(address => new Promise((resolve, reject) => {
+                  this.entity.address = address;
+                  this.flag.loading = false;
+                  this.flag.success = true;
+                  resolve();
+               }))
+               .catch((error) => {
+                  this.errorMsg.push(error);
+                  this.flag.loading = false;
+               });
+         }
+      },
+
+      /*
+      *  Async PATCH transactions,
+      *  then update existing address with backend datas when promise is resolved
+      */
+      updateAddress(payload)
+      {
+         // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
+         this.flag.loading = true;
+         if ('newPostcode' in payload.newAddress) {
+
+            let postcodeBody = payload.newAddress.newPostcode;
+            postcodeBody = Object.assign(postcodeBody, {'origin': 3});
+
+            postPostalCode(postcodeBody)
+               .then(postalCode => {
+                  let body = payload.newAddress;
+                  body.postcode = {'id': postalCode.id },
+                     patchAddress(payload.addressId, body)
+                        .then(address => new Promise((resolve, reject) => {
+                           this.entity.address = address;
+                           this.flag.loading = false;
+                           this.flag.success = true;
+                           resolve();
+                        }))
+                        .catch((error) => {
+                           this.errorMsg.push(error);
+                           this.flag.loading = false;
+                        });
+               })
+
+         } else {
+            patchAddress(payload.addressId, payload.newAddress)
+               .then(address => new Promise((resolve, reject) => {
+                  this.entity.address = address;
+                  this.flag.loading = false;
+                  this.flag.success = true;
+                  resolve();
+               }))
+               .catch((error) => {
+                  this.errorMsg.push(error);
+                  this.flag.loading = false;
+               });
+         }
+      },
+
+      /*
+      *  When submit address
+      *  (get out step1 show pane, submit button)
+      */
+      submitNewAddress()
+      {
+         let payload = {
+            entity: this.context.entity.type,
+            entityId: this.context.entity.id,
+            addressId: this.entity.address.address_id,
+            body: {
+               validFrom: {
+                  datetime: `${this.valid.from.toISOString().split('T')[0]}T00:00:00+0100`
+               }
+            },
+            backUrl: this.context.backUrl
+         }
+
+         if ( payload.entity !== 'person' && payload.entity !== 'household' ) {
+
+            // just return payload to parent
+            // (changes will be patched in parent store)
+            this.initForm();
+            this.flag.showPane = false;
+            return payload;
+         }
+
+         console.log('submitNewAddress with', payload);
+         this.addDateToAddressAndAddressTo(payload);
+
+         this.initForm();
+         this.flag.showPane = false;
+      },
+
+      addDateToAddressAndAddressTo(payload)
+      {
+         console.log('addDateToAddressAndAddressTo', payload.entity)
+         this.flag.loading = true;
+         return patchAddress(payload.addressId, payload.body)
+            .then(address => new Promise((resolve, reject) => {
+                  this.valid.from = address.validFrom;
+                  resolve();
+               })
+               .then(this.postAddressTo(payload))
+            )
             .catch((error) => {
-               this.errorMsg.push(error.message);
-               this.loading = false;
+               this.errorMsg.push(error);
+               this.flag.loading = false;
             });
       },
-      updateMapCenter(point) {
-         console.log('point', point);
-         this.address.addressMap.center[0] = point.coordinates[1];  // TODO use reverse()
-         this.address.addressMap.center[1] = point.coordinates[0];
-         this.$refs.addressMap.update(); // cast child methods
+
+      postAddressTo(payload)
+      {
+         console.log('postAddressTo', payload.entity);
+         if (!this.context.edit) {
+            switch (payload.entity) {
+               case 'household':
+                  postAddressToHousehold(payload.entityId, payload.addressId)
+                     .then(household => new Promise((resolve, reject) => {
+                        console.log('postAddressToHousehold', household);
+                        this.flag.loading = false;
+                        this.flag.success = true;
+                        window.location.assign(payload.backUrl);
+                        resolve();
+                     }))
+                     .catch((error) => {
+                        this.errorMsg.push(error);
+                        this.flag.loading = false;
+                     })
+                  ;
+                  break;
+               case 'person':
+                  postAddressToPerson(payload.entityId, payload.addressId)
+                     .then(person => new Promise((resolve, reject) => {
+                        console.log('postAddressToPerson', person);
+                        this.flag.loading = false;
+                        this.flag.success = true;
+                        window.location.assign(payload.backUrl);
+                        resolve();
+                     }))
+                     .catch((error) => {
+                        this.errorMsg.push(error);
+                        this.flag.loading = false;
+                     })
+                  ;
+                  break;
+               default:
+                  this.errorMsg.push('That entity is not managed by address !');
+            }
+         } else {
+            // address is already linked, just finish !
+            window.location.assign(payload.backUrl);
+         }
       },
-      resetAll() {
-         console.log('reset all selected');
-         this.address.loaded.addresses = [];
-         this.address.selected.address = {};
-         this.address.loaded.cities = [];
-         this.address.selected.city = {};
-         this.address.selected.country = {};
-         this.address.isNoAddress = this.edit ? this.$store.state.editAddress.isNoAddress: false;;
-         this.address.street = this.edit ? this.$store.state.editAddress.street: null;
-         this.address.streetNumber = this.edit ? this.$store.state.editAddress.streetNumber: null;
-         this.address.floor = this.edit ? this.$store.state.editAddress.floor: null;
-         this.address.corridor = this.edit ? this.$store.state.editAddress.corridor: null;
-         this.address.steps = this.edit ? this.$store.state.editAddress.steps: null;
-         this.address.flat = this.edit ? this.$store.state.editAddress.flat: null;
-         this.address.buildingName = this.edit ? this.$store.state.editAddress.buildingName: null;
-         this.address.distribution = this.edit ? this.$store.state.editAddress.distribution: null;
-         this.address.extra = this.edit ? this.$store.state.editAddress.extra: null;
-         this.address.writeNewAddress = this.edit;
-         this.address.writeNewPostalCode = this.edit;
-         this.address.newPostalCode = this.edit ?
-             {
-                 code: this.$store.state.editAddress.postcode !== undefined ? this.$store.state.editAddress.postcode.code : null,
-                 name: this.$store.state.editAddress.postcode !== undefined ? this.$store.state.editAddress.postcode.name : null
-             } : {};
-         console.log('cities and addresses', this.address.loaded.cities, this.address.loaded.addresses);
-      }
+
    }
 }
 </script>
 
 <style lang="scss">
-
-div.address-form {
-   h4.h3 {
-      font-weight: bold;
-   }
-   div#address_map {
-      height: 400px;
-      width: 100%;
+div.entity-address {
+   position: relative;
+   div.loading {
+      position: absolute;
+      right: 0; top: -55px;
    }
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue
index 978862d82..c6abd92d5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue
@@ -13,16 +13,18 @@ let marker;
 
 export default {
    name: 'AddressMap',
-   props: ['address'],
+   props: ['entity'],
    computed: {
       center() {
-         return this.address.addressMap.center;
+         return this.entity.selected.addressMap.center;
       },
    },
    methods:{
       init() {
          map = L.map('address_map').setView([46.67059, -1.42683], 12);
 
+         map.scrollWheelZoom.disable();
+
          L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
             attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
          }).addTo(map);
@@ -36,9 +38,9 @@ export default {
 
       },
       update() {
-         console.log('update map with : ', this.address.addressMap.center)
-         marker.setLatLng(this.address.addressMap.center);
-         map.setView(this.address.addressMap.center, 15);
+         //console.log('update map with : ', this.address.addressMap.center)
+         marker.setLatLng(this.entity.addressMap.center);
+         map.setView(this.entity.addressMap.center, 15);
       }
    },
    mounted(){
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
index 11c25b318..1216871ab 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
@@ -74,69 +74,62 @@
 <script>
 export default {
    name: "AddressMore",
-   props: ['address'],
+   props: ['entity'],
    computed: {
       floor: {
          set(value) {
-            console.log('value', value);
-            this.address.floor = value;
+            this.entity.selected.address.floor = value;
          },
          get() {
-            return this.address.floor;
+            return this.entity.selected.address.floor;
          }
       },
       corridor: {
          set(value) {
-            console.log('value', value);
-            this.address.corridor = value;
+            this.entity.selected.address.corridor = value;
          },
          get() {
-            return this.address.corridor;
+            return this.entity.selected.address.corridor;
          }
       },
       steps: {
          set(value) {
-            console.log('value', value);
-            this.address.steps = value;
+            this.entity.selected.address.steps = value;
          },
          get() {
-            return this.address.steps;
+            return this.entity.selected.address.steps;
          }
       },
       flat: {
          set(value) {
-            console.log('value', value);
-            this.address.flat = value;
+            this.entity.selected.address.flat = value;
          },
          get() {
-            return this.address.flat;
+            return this.entity.selected.address.flat;
          }
       },
       buildingName: {
          set(value) {
-            console.log('value', value);
-            this.address.buildingName = value;
+            this.entity.selected.address.buildingName = value;
          },
          get() {
-            return this.address.buildingName;
+            return this.entity.selected.address.buildingName;
          }
       },
       extra: {
          set(value) {
-            console.log('value', value);
-            this.address.extra = value;
+            this.entity.selected.address.extra = value;
          },
          get() {
-            return this.address.extra;
+            return this.entity.selected.address.extra;
          }
       },
       distribution: {
          set(value) {
-            console.log('value', value);
-            this.address.distribution = value;
+            this.entity.selected.address.distribution = value;
          },
          get() {
-            return this.address.distribution;
+            return this.entity.selected.address.distribution;
          }
       }
    }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
index 656d1e068..97fd495ab 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
@@ -47,7 +47,7 @@ import VueMultiselect from 'vue-multiselect';
 export default {
    name: 'AddressSelection',
    components: { VueMultiselect },
-   props: ['address', 'updateMapCenter'],
+   props: ['entity', 'updateMapCenter'],
    data() {
       return {
          value: null
@@ -55,28 +55,28 @@ export default {
    },
    computed: {
       writeNewAddress() {
-         return this.address.writeNewAddress;
+         return this.entity.selected.writeNew.address;
       },
       writeNewPostalCode() {
-         return this.address.writeNewPostalCode;
+         return this.entity.selected.writeNew.postCode;
       },
       addresses() {
-         return this.address.loaded.addresses;
+         return this.entity.loaded.addresses;
       },
       street: {
          set(value) {
-            this.address.street = value;
+            this.entity.selected.address.street = value;
          },
          get() {
-            return this.address.street;
+            return this.entity.selected.address.street;
          }
       },
       streetNumber: {
          set(value) {
-            this.address.streetNumber = value;
+            this.entity.selected.address.streetNumber = value;
          },
          get() {
-            return this.address.streetNumber;
+            return this.entity.selected.address.streetNumber;
          }
       },
    },
@@ -85,13 +85,13 @@ export default {
          return value.streetNumber === undefined ? value.street : `${value.streetNumber}, ${value.street}`
       },
       selectAddress(value) {
-         this.address.selected.address = value;
-         this.address.street = value.street;
-         this.address.streetNumber = value.streetNumber;
+         this.entity.selected.address = value;
+         this.entity.selected.address.street = value.street;
+         this.entity.selected.address.streetNumber = value.streetNumber;
          this.updateMapCenter(value.point);
       },
       addAddress() {
-         this.address.writeNewAddress = true;
+         this.entity.selected.writeNew.address = true;
       }
    }
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
index cd322c03c..d0e196361 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
@@ -12,13 +12,13 @@
          :placeholder="$t('select_city')"
          :taggable="true"
          :multiple="false"
-         @tag="addPostalCode"
+         @tag="addPostcode"
          :tagPlaceholder="$t('create_postal_code')"
          :options="cities">
       </VueMultiselect>
    </div>
-   
-   <div class="custom-postcode row g-1" v-if="writeNewPostalCode">
+
+   <div class="custom-postcode row g-1" v-if="writeNewPostcode">
       <div class="col-4">
          <div class="form-floating">
             <input class="form-control"
@@ -28,7 +28,7 @@
                v-model="code"/>
             <label for="code">{{ $t('postalCode_code') }}</label>
          </div>
-      </div> 
+      </div>
       <div class="col-8">
          <div class="form-floating">
             <input class="form-control"
@@ -48,33 +48,34 @@ import VueMultiselect from 'vue-multiselect';
 export default {
    name: 'CitySelection',
    components: { VueMultiselect },
-   props: ['address', 'getReferenceAddresses', 'focusOnAddress'],
+   props: ['entity', 'focusOnAddress'],
+   emits: ['getReferenceAddresses'],
    data() {
       return {
          value: null
       }
    },
    computed: {
-      writeNewPostalCode() {
-         return this.address.writeNewPostalCode;
+      writeNewPostcode() {
+         return this.entity.selected.writeNew.postcode;
       },
       cities() {
-         return this.address.loaded.cities;
+         return this.entity.loaded.cities;
       },
       name: {
          set(value) {
-            this.address.newPostalCode.name = value;
+            this.entity.selected.postcode.name = value;
          },
          get() {
-            return this.address.newPostalCode.name;
+            return this.entity.selected.postcode.name;
          }
       },
       code: {
          set(value) {
-            this.address.newPostalCode.code= value;
+            this.entity.selected.postcode.code= value;
          },
          get() {
-            return this.address.newPostalCode.code;
+            return this.entity.selected.postcode.code;
          }
       },
    },
@@ -83,14 +84,14 @@ export default {
          return `${value.code}-${value.name}`
       },
       selectCity(value) {
-         this.address.selected.city = value;
-         this.address.newPostalCode.name = value.name;
-         this.address.newPostalCode.code = value.code;
-         this.getReferenceAddresses(value);
+         this.entity.selected.city = value;
+         this.entity.selected.postcode.name = value.name;
+         this.entity.selected.postcode.code = value.code;
+         this.$emit('getReferenceAddresses', value);
          this.focusOnAddress();
       },
-      addPostalCode() {
-         this.address.writeNewPostalCode = true;
+      addPostcode() {
+         this.entity.selected.writeNew.postcode = true;
       }
    }
 };
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 4e23f0d34..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
@@ -2,13 +2,13 @@
    <div class="my-1">
       <label class="col-form-label" for="countrySelect">{{ $t('country') }}</label>
       <VueMultiselect
-         v-model="value"
          id="countrySelect"
-         track-by="id"
          label="name"
-         :custom-label="transName"
-         :placeholder="$t('select_country')"
-         :options="countries"
+         track-by="id"
+         v-bind:custom-label="transName"
+         v-bind:placeholder="$t('select_country')"
+         v-bind:options="sortedCountries"
+         v-model="value"
          @select="selectCountry">
       </VueMultiselect>
    </div>
@@ -20,43 +20,47 @@ import VueMultiselect from 'vue-multiselect';
 export default {
    name: 'CountrySelection',
    components: { VueMultiselect },
-   props: ['address', 'getCities'],
+   props: ['context', 'entity'],
+   emits: ['getCities'],
    data() {
       return {
-         edit: window.mode === 'edit',
-         defaultCountry: this.edit ? this.$store.state.editAddress.country.code : 'FR',
-         value: this.address.loaded.countries.filter(c => c.countryCode === this.defaultCountry)[0]
+         value: this.selectCountryByCode(
+            this.context.edit ? this.entity.selected.country.code : 'FR'
+         )
       }
    },
+   computed: {
+      sortedCountries() {
+         //console.log('sorted countries');
+         const countries = this.entity.loaded.countries;
+         let sortedCountries = [];
+         sortedCountries.push(...countries.filter(c => c.countryCode === 'FR'))
+         sortedCountries.push(...countries.filter(c => c.countryCode === 'BE'))
+         sortedCountries.push(...countries.filter(c => c.countryCode !== 'FR').filter(c => c.countryCode !== 'BE'))
+         return sortedCountries;
+      }
+   },
+   mounted() {
+      this.init();
+   },
    methods: {
       init() {
-         this.value = this.edit ?
-            this.address.loaded.countries.filter(c => c.countryCode === this.$store.state.editAddress.country.code)[0]:
-            this.address.loaded.countries.filter(c => c.countryCode === 'FR')[0]
          if (this.value !== undefined) {
             this.selectCountry(this.value);
          }
       },
+      selectCountryByCode(countryCode) {
+         return this.entity.loaded.countries.filter(c => c.countryCode === countryCode)[0];
+      },
       transName ({ name }) {
          return name.fr //TODO multilang
       },
       selectCountry(value) {
-         this.address.selected.country = value;
-         this.getCities(value);
-      },
-   },
-   mounted(){
-      this.init()
-   },
-   computed: {
-      countries() {
-         const countries = this.address.loaded.countries;
-         let orderedCountries = [];
-         orderedCountries.push(...countries.filter(c => c.countryCode === 'FR'))
-         orderedCountries.push(...countries.filter(c => c.countryCode === 'BE'))
-         orderedCountries.push(...countries.filter(c => c.countryCode !== 'FR').filter(c => c.countryCode !== 'BE'))
-         return orderedCountries;
+         //console.log('select country', value);
+         this.entity.selected.country = value;
+         this.$emit('getCities', value);
       }
+
    }
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/components/SelectHouseholdAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/SelectHouseholdAddress.vue
similarity index 100%
rename from src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/components/SelectHouseholdAddress.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/SelectHouseholdAddress.vue
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue
new file mode 100644
index 000000000..017e6fd24
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue
@@ -0,0 +1,160 @@
+<template>
+   <div class="address-form">
+
+      <!-- Not display in modal -->
+      <div v-if="insideModal == false" class="loading">
+         <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
+         <span class="sr-only">Loading...</span>
+      </div>
+
+      <h4 class="h3">{{ $t('select_an_address_title') }}</h4>
+      <div class="row my-3">
+         <div class="col-lg-6">
+
+            <div class="form-check">
+               <input type="checkbox"
+                  class="form-check-input"
+                  id="isNoAddress"
+                  v-model="isNoAddress"
+                  v-bind:value="value" />
+               <label class="form-check-label" for="isNoAddress">
+                  {{ $t('isNoAddress') }}
+               </label>
+            </div>
+
+            <country-selection
+               v-bind:context="context"
+               v-bind:entity="entity"
+               @getCities="$emit('getCities', selected.country)">
+            </country-selection>
+
+            <city-selection
+               v-bind:entity="entity"
+               v-bind:focusOnAddress="focusOnAddress"
+               @getReferenceAddresses="$emit('getReferenceAddresses', selected.city)">
+            </city-selection>
+
+            <address-selection v-if="!isNoAddress"
+               v-bind:entity="entity"
+               v-bind:updateMapCenter="updateMapCenter">
+            </address-selection>
+
+         </div>
+         <div class="col-lg-6 mt-3 mt-lg-0">
+
+            <address-map
+               v-bind:entity="entity"
+               ref="addressMap">
+            </address-map>
+
+         </div>
+      </div>
+
+      <address-more v-if="!isNoAddress"
+         v-bind:entity="entity">
+      </address-more>
+
+      <!-- Not display in modal -->
+      <ul v-if="insideModal == false"
+          class="record_actions sticky-form-buttons">
+         <li class="cancel">
+            <a class="btn btn-cancel" v-bind:href="context.backUrl">
+               {{ $t('back_to_the_list') }}
+            </a>
+         </li>
+         <li>
+            <a class="btn btn-cancel change-icon" @click="flag.showPane = true; flag.editPane = false;">
+               {{ $t('action.cancel') }}
+            </a>
+         </li>
+         <li>
+            <a class="btn btn-update" @click.prevent="$emit('closeEditPane')">
+               {{ $t('action.valid_and_see')}}
+            </a>
+         </li>
+      </ul>
+
+   </div>
+</template>
+
+<script>
+import CountrySelection from './AddAddress/CountrySelection';
+import CitySelection from './AddAddress/CitySelection';
+import AddressSelection from './AddAddress/AddressSelection';
+import AddressMap from './AddAddress/AddressMap';
+import AddressMore from './AddAddress/AddressMore'
+
+export default {
+   name: "EditAddressPane",
+   components: {
+      CountrySelection,
+      CitySelection,
+      AddressSelection,
+      AddressMap,
+      AddressMore
+   },
+   props: [
+      'context',
+      'options',
+      'default',
+      'flag',
+      'entity',
+      'errorMsg',
+      'insideModal'
+   ],
+   emits: ['closeEditPane', 'getCities', 'getReferenceAddresses'],
+   data() {
+      return {
+         value: false
+      }
+   },
+   computed: {
+      address() {
+         return this.entity.address;
+      },
+      loaded() {
+         return this.entity.loaded;
+      },
+      selected() {
+         return this.entity.selected;
+      },
+      addressMap() {
+         return this.entity.addressMap;
+      },
+      isNoAddress: {
+         set(value) {
+            console.log('isNoAddress value', value);
+            this.entity.selected.isNoAddress = value;
+         },
+         get() {
+            return this.entity.selected.isNoAddress;
+         }
+      }
+   },
+   methods: {
+      focusOnAddress() {
+         const addressSelector = document.getElementById('addressSelector');
+         addressSelector.focus();
+      },
+      updateMapCenter(point) {
+         //console.log('point', point);
+         this.addressMap.center[0] = point.coordinates[1];  // TODO use reverse()
+         this.addressMap.center[1] = point.coordinates[0];
+         this.$refs.addressMap.update(); // cast child methods
+      }
+   }
+};
+</script>
+
+<style lang="scss">
+
+div.address-form {
+   h4.h3 {
+      font-weight: bold;
+   }
+   div#address_map {
+      height: 400px;
+      width: 100%;
+   }
+}
+</style>
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 786f0dce6..056d1044f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
@@ -1,64 +1,62 @@
 <template>
-   <div class="address multiline">
-      <p v-if="address.text"
-         class="street">
-         {{ address.text }}
-      </p>
-      <p v-if="address.postcode"
-         class="postcode">
-         {{ address.postcode.name }}
-      </p>
-      <p v-if="address.country"
-         class="country">
-         {{ address.country.name.fr }}
-      </p>
-
-      <div v-if="address.floor">
-         <span class="floor">
-            <b>{{ $t('floor') }}</b>: {{ address.floor }}
-         </span>
+   <div class="chill-entity entity-address my-3">
+      <div class="address multiline">
+         <p v-if="address.text"
+            class="street">
+            {{ address.text }}
+         </p>
+         <p v-if="address.postcode"
+            class="postcode">
+            {{ address.postcode.code }} {{ address.postcode.name }}
+         </p>
+         <p v-if="address.country"
+            class="country">
+            {{ address.country.name.fr }}
+         </p>
       </div>
-      <div v-if="address.corridor">
-         <span class="corridor">
-            <b>{{ $t('corridor') }}</b>: {{ address.corridor }}
-         </span>
-      </div>
-      <div v-if="address.steps">
-         <span class="steps">
-            <b>{{ $t('steps') }}</b>: {{ address.steps }}
-         </span>
-      </div>
-      <div v-if="address.flat">
-         <span class="flat">
-            <b>{{ $t('flat') }}</b>: {{ address.flat }}
-         </span>
-      </div>
-      <div v-if="address.buildingName">
-         <span class="buildingName">
-            <b>{{ $t('buildingName') }}</b>: {{ address.buildingName }}
-         </span>
-      </div>
-      <div v-if="address.extra">
-         <span class="extra">
-            <b>{{ $t('extra') }}</b>: {{ address.extra }}
-         </span>
-      </div>
-      <div v-if="address.distribution">
-         <span class="distribution">
-            <b>{{ $t('distribution') }}</b>: {{ address.distribution }}
-         </span>
+      <div>
+         <div v-if="address.floor">
+            <span class="floor">
+               <b>{{ $t('floor') }}</b>: {{ address.floor }}
+            </span>
+         </div>
+         <div v-if="address.corridor">
+            <span class="corridor">
+               <b>{{ $t('corridor') }}</b>: {{ address.corridor }}
+            </span>
+         </div>
+         <div v-if="address.steps">
+            <span class="steps">
+               <b>{{ $t('steps') }}</b>: {{ address.steps }}
+            </span>
+         </div>
+         <div v-if="address.flat">
+            <span class="flat">
+               <b>{{ $t('flat') }}</b>: {{ address.flat }}
+            </span>
+         </div>
+         <div v-if="address.buildingName">
+            <span class="buildingName">
+               <b>{{ $t('buildingName') }}</b>: {{ address.buildingName }}
+            </span>
+         </div>
+         <div v-if="address.extra">
+            <span class="extra">
+               <b>{{ $t('extra') }}</b>: {{ address.extra }}
+            </span>
+         </div>
+         <div v-if="address.distribution">
+            <span class="distribution">
+               <b>{{ $t('distribution') }}</b>: {{ address.distribution }}
+            </span>
+         </div>
       </div>
    </div>
 </template>
 
 <script>
-
 export default {
-   name: 'ShowAddress',
-   props: ['address'],
-   data() {
-      return {
-      }
-   },
-};
+   name: "ShowAddress",
+   props: ['address']
+}
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
new file mode 100644
index 000000000..14ca059c0
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
@@ -0,0 +1,101 @@
+<template>
+
+   <div v-if="insideModal == false" class="loading">
+      <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
+      <span class="sr-only">{{ $t('loading') }}</span>
+   </div>
+   <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
+      {{ errorMsg }}
+   </div>
+   <div v-if="flag.success" class="alert alert-success">
+      {{ $t(getSuccessText) }}
+   </div>
+
+   <show-address :address="address"></show-address>
+
+   <div v-if="showDateFrom" class='address-valid date-since'>
+      <h3>{{ $t(getValidFromDateText) }}</h3>
+      <div class="input-group mb-3">
+         <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
+         <input type="date" class="form-control form-control-lg" name="validFrom"
+                v-bind:placeholder="$t(getValidFromDateText)"
+                v-model="validFrom"
+                aria-describedby="validFrom"
+         />
+      </div>
+   </div>
+
+   <ul v-if="insideModal == false"
+      class="record_actions sticky-form-buttons">
+      <li class="cancel">
+         <a class="btn btn-cancel" v-bind:href="context.backUrl">
+            {{ $t('back_to_the_list') }}</a>
+      </li>
+      <li>
+         <a @click.prevent="$emit('openEditPane')"
+            class="btn btn-update">
+            {{ $t('action.edit')}}
+         </a>
+      </li>
+      <li>
+         <a class="btn btn-save"
+            @click.prevent="$emit('submitAddress')">
+            {{ $t('action.save')}}
+         </a>
+      </li>
+   </ul>
+</template>
+
+<script>
+import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
+import ShowAddress from './ShowAddress.vue';
+
+export default {
+   name: 'ShowAddressPane',
+   components: {
+      ShowAddress
+   },
+   props: [
+      'context',
+      'options',
+      'default',
+      'flag',
+      'entity',
+      'valid',
+      'errorMsg',
+      'insideModal'
+   ],
+   emits: ['openEditPane', 'submitAddress'], //?
+   computed: {
+      address() {
+         return this.entity.address;
+      },
+      validFrom: {
+         set(value) {
+            this.valid.from = ISOToDate(value);
+         },
+         get() {
+            return dateToISO(this.valid.from);
+         }
+      },
+      getValidFromDateText() {
+         return (this.context.entity.type === 'household') ? 'move_date' : 'validFrom';
+      },
+      getSuccessText() {
+         switch (this.context.entity.type) {
+            /*
+            case 'household':
+               return (this.context.edit) ? 'household_address_edit_success' : 'household_address_move_success';
+            case 'person':
+               return (this.context.edit) ? 'person_address_edit_success' : 'person_address_creation_success';
+            */
+            default:
+               return (this.context.edit) ? 'address_edit_success' : 'address_new_success';
+         }
+      },
+      showDateFrom() {
+         return !this.context.edit && !this.options.hideDateFrom;
+      }
+   }
+};
+</script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
new file mode 100644
index 000000000..9cfd05a3e
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -0,0 +1,55 @@
+const addressMessages = {
+    fr: {
+        add_an_address_title: 'Créer une adresse',
+        edit_an_address_title: 'Modifier une adresse',
+        create_a_new_address: 'Créer une nouvelle adresse',
+        edit_address: 'Modifier l\'adresse',
+        select_an_address_title: 'Sélectionner une adresse',
+        fill_an_address: 'Compléter l\'adresse',
+        select_country: 'Choisir le pays',
+        country: 'Pays',
+        select_city: 'Choisir une localité',
+        city: 'Localité',
+        other_city: 'Autre localité',
+        select_address: 'Choisir une adresse',
+        address: 'Adresse',
+        other_address: 'Autre adresse',
+        create_address: 'Adresse inconnue. Cliquez ici pour créer une nouvelle adresse',
+        isNoAddress: 'Pas d\'adresse complète',
+        street: 'Nom de rue',
+        streetNumber: 'Numéro',
+        floor: 'Étage',
+        corridor: 'Couloir',
+        steps: 'Escalier',
+        flat: 'Appartement',
+        buildingName: 'Nom du bâtiment',
+        extra: 'Complément d\'adresse',
+        distribution: 'Service particulier de distribution',
+        create_postal_code: 'Localité inconnue. Cliquez ici pour créer une nouvelle localité',
+        postalCode_name: 'Nom',
+        postalCode_code: 'Code postal',
+        date: 'Date de la nouvelle adresse',
+        validFrom: 'Date de la nouvelle adresse',
+        back_to_the_list: 'Retour à la liste',
+        loading: 'chargement en cours...',
+        address_new_success: 'La nouvelle adresse est enregistrée',
+        address_edit_success: 'L\'adresse a été mise à jour',
+
+        // person specific
+        add_an_address_to_person: 'Ajouter l\'adresse à la personne',
+        person_address_creation_success: 'La nouvelle adresse de la personne est enregistrée',
+        person_address_edit_success: 'L\'adresse de la personne a été mise à jour',
+
+        // household specific
+        move_date: 'Date du déménagement',
+        select_a_existing_address: 'Sélectionner une adresse existante',
+        add_an_address_to_household: 'Enregistrer',
+        household_address_move_success: 'La nouvelle adresse du ménage est enregistrée',
+        household_address_edit_success: 'L\'adresse du ménage a été mise à jour',
+
+    }
+};
+
+export {
+    addressMessages
+};
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index 27676369e..bb2dd6543 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -1,16 +1,13 @@
-import { createApp } from 'vue'
-import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
-import { addressMessages } from './js/i18n'
-import { store } from './store'
-
+import { createApp } from 'vue';
 import App from './App.vue';
+import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n';
+import { addressMessages } from './i18n';
 
-const i18n = _createI18n(addressMessages);
+const i18n = _createI18n( addressMessages );
 
 const app = createApp({
-   template: `<app></app>`,
+    template: `<app></app>`,
 })
-.use(store)
 .use(i18n)
 .component('app', App)
 .mount('#address');
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
deleted file mode 100644
index f8a7ea4d2..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
+++ /dev/null
@@ -1,42 +0,0 @@
-const addressMessages = {
-   fr: {
-      add_an_address_title: 'Créer une adresse',
-      edit_an_address_title: 'Modifier une adresse',
-      create_a_new_address: 'Créer une nouvelle adresse',
-      edit_address: 'Modifier l\'adresse',
-      select_an_address_title: 'Sélectionner une adresse',
-      fill_an_address: 'Compléter l\'adresse',
-      select_country: 'Choisir le pays',
-      country: 'Pays',
-      select_city: 'Choisir une localité',
-      city: 'Localité',
-      other_city: 'Autre localité',
-      select_address: 'Choisir une adresse',
-      address: 'Adresse',
-      other_address: 'Autre adresse',
-      create_address: 'Adresse inconnue. Cliquez ici pour créer une nouvelle adresse',
-      isNoAddress: 'Pas d\'adresse complète',
-      street: 'Nom de rue',
-      streetNumber: 'Numéro',
-      floor: 'Étage',
-      corridor: 'Couloir',
-      steps: 'Escalier',
-      flat: 'Appartement',
-      buildingName: 'Nom du bâtiment',
-      extra: 'Complément d\'adresse',
-      distribution: 'Service particulier de distribution',
-      create_postal_code: 'Localité inconnue. Cliquez ici pour créer une nouvelle localité',
-      postalCode_name: 'Nom',
-      postalCode_code: 'Code postal',
-      date: 'Date de la nouvelle adresse',
-      add_an_address_to_person: 'Ajouter l\'adresse à la personne',
-      validFrom: 'Date de la nouvelle adresse',
-      back_to_the_list: 'Retour à la liste',
-      person_address_creation_success: 'La nouvelle adresse de la personne est enregistrée',
-      loading: 'chargement en cours...'
-   }
-};
-
-export {
-   addressMessages
-};
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store.js
new file mode 100644
index 000000000..392d033f5
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store.js
@@ -0,0 +1,14 @@
+import 'es6-promise/auto';
+import { createStore } from 'vuex';
+
+const debug = process.env.NODE_ENV !== 'production';
+
+const store = createStore({
+    strict: debug,
+    state: {},
+    getters: {},
+    mutations: {},
+    actions: {},
+});
+
+export { store };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
deleted file mode 100644
index 967675c8f..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
+++ /dev/null
@@ -1,158 +0,0 @@
-import 'es6-promise/auto';
-import { createStore } from 'vuex';
-
-import { patchAddress, postAddress, postPostalCode, postAddressToPerson, getAddress } from '../api'
-
-const debug = process.env.NODE_ENV !== 'production';
-
-const store = createStore({
-   strict: debug,
-   state: {
-      address: {},
-      editAddress: {}, //TODO or should be address?
-      person: {},
-      errorMsg: [],
-      loading: false,
-      success: false
-   },
-   getters: {
-   },
-   mutations: {
-      catchError(state, error) {
-         state.errorMsg.push(error);
-      },
-      addAddress(state, address) {
-         console.log('@M addAddress address', address);
-         state.address = address;
-      },
-      updateAddress(state, address) {
-         console.log('@M updateAddress address', address);
-         state.address = address;
-      },
-      addAddressToPerson(state, person) {
-         console.log('@M addAddressToPerson person', person);
-         state.person = person;
-      },
-      addDateToAddress(state, validFrom) {
-         console.log('@M addDateToAddress address.validFrom', validFrom);
-         state.validFrom = validFrom;
-      },
-      getEditAddress(state, address) {
-         console.log('@M getEditAddress address', address);
-         state.editAddress = address;
-      },
-      setLoading(state, b) {
-         state.loading = b;
-      },
-      setSuccess(state, b) {
-         state.success = b;
-      }
-   },
-   actions: {
-      addAddress({ commit }, payload) {
-         console.log('@A addAddress payload', payload);
-         commit('setLoading', true);
-         if('newPostalCode' in payload){
-            let postalCodeBody = payload.newPostalCode;
-            postalCodeBody = Object.assign(postalCodeBody, {'origin': 3});
-            postPostalCode(postalCodeBody)
-               .then(postalCode => {
-                  let body = payload;
-                  body.postcode = {'id': postalCode.id},
-                  postAddress(body)
-                     .then(address => new Promise((resolve, reject) => {
-                        commit('addAddress', address);
-                        resolve();
-                        commit('setLoading', false);
-                     }))
-                     .catch((error) => {
-                        commit('catchError', error);
-                        commit('setLoading', false);
-                     });
-               })
-
-         } else {
-            postAddress(payload)
-               .then(address => new Promise((resolve, reject) => {
-                  commit('addAddress', address);
-                  resolve();
-                  commit('setLoading', false);
-               }))
-               .catch((error) => {
-                  commit('catchError', error);
-                  commit('setLoading', false);
-               });
-         }
-      },
-      addDateToAddressAndAddressToPerson({ commit }, payload) {
-         console.log('@A addDateToAddressAndAddressToPerson payload', payload);
-         commit('setLoading', true);
-         patchAddress(payload.addressId, payload.body)
-            .then(address => new Promise((resolve, reject) => {
-               commit('addDateToAddress', address.validFrom);
-               resolve();
-            }).then(
-               postAddressToPerson(payload.personId, payload.addressId)
-                  .then(person => new Promise((resolve, reject) => {
-                     commit('addAddressToPerson', person);
-                     commit('setLoading', false);
-                     commit('setSuccess', true);
-                     window.location.assign(payload.backUrl);
-                     resolve();
-               }))
-               .catch((error) => {
-                  commit('catchError', error);
-                  commit('setLoading', false);
-               })
-            ))
-            .catch((error) => {
-               commit('catchError', error);
-               commit('setLoading', false);
-            });
-      },
-      updateAddress({ commit }, payload) {
-         console.log('@A updateAddress payload', payload);
-
-         if('newPostalCode' in payload.newAddress){ // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
-            let postalCodeBody = payload.newAddress.newPostalCode;
-            postalCodeBody = Object.assign(postalCodeBody, {'origin': 3});
-            postPostalCode(postalCodeBody)
-               .then(postalCode => {
-                  let body = payload.newAddress;
-                  body.postcode = {'id': postalCode.id },
-                  patchAddress(payload.addressId, body)
-                     .then(address => new Promise((resolve, reject) => {
-                        commit('updateAddress', address);
-                        resolve();
-                     }))
-                     .catch((error) => {
-                        commit('catchError', error);
-                     });
-               })
-
-         } else {
-            patchAddress(payload.addressId, payload.newAddress)
-               .then(address => new Promise((resolve, reject) => {
-                  commit('updateAddress', address);
-                  resolve();
-               }))
-               .catch((error) => {
-                  commit('catchError', error);
-               });
-         }
-      },
-      getEditAddress({ commit }, payload) {
-         console.log('@A getEditAddress payload', payload);
-
-         getAddress(payload).then(address => new Promise((resolve, reject) => {
-            commit('getEditAddress', address);
-            resolve();
-         }))
-         .catch((error) => {
-            commit('catchError', error);
-         });
-      },
-   }
-});
-
-export { store };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index 44d444247..b806c4b3e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -24,16 +24,16 @@
          <!-- :: end styles bootstrap :: -->
       </div>
    </transition>
-</template> 
+</template>
 
 <script>
 /*
- *    This Modal component is a mix between Vue3 modal implementation 
+ *    This Modal component is a mix between Vue3 modal implementation
  *    [+] with 'v-if:showModal' directive:parameter, html scope is added/removed not just shown/hidden
  *    [+] with slot we can pass content from parent component
  *    [+] some classes are passed from parent component
  *    and Bootstrap 4.6 _modal.scss module
- *    [+] using bootstrap css classes, the modal have a responsive behaviour, 
+ *    [+] using bootstrap css classes, the modal have a responsive behaviour,
  *    [+] modal design can be configured using css classes (size, scroll)
  */
 export default {
@@ -54,7 +54,7 @@ export default {
       background-color: rgba(0, 0, 0, 0.75);
       transition: opacity 0.3s ease;
    }
-   .modal-header .close { 
+   .modal-header .close {
       border-top-right-radius: 0.3rem;
    }
    /*
@@ -71,7 +71,8 @@ export default {
    .modal-leave-active {
       opacity: 0;
    }
-   .modal-enter .modal-container,
+   .modal-enter
+   .modal-container,
    .modal-leave-active .modal-container {
       -webkit-transform: scale(1.1);
       transform: scale(1.1);
@@ -80,4 +81,9 @@ export default {
       font-size: 1.5rem;
       font-weight: bold;
    }
+   div.modal-footer {
+      button:first-child {
+         margin-right: auto;
+      }
+   }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
index 19bfef197..969e68456 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
@@ -1,21 +1,21 @@
 <template>
-  
-   <a class="btn" target="_blank"
+
+   <a class="btn btn-sm" target="_blank"
       :class="classAction"
       :title="$t(titleAction)"
       @click="openModal">
       {{ buttonText }}
    </a>
-  
+
    <teleport to="body">
       <modal v-if="modal.showModal"
          :modalDialogClass="modal.modalDialogClass"
          @close="modal.showModal = false">
-         
+
          <template v-slot:header>
             <h3 class="modal-title">{{ $t(titleModal) }}</h3>
          </template>
-         
+
          <template v-slot:body v-if="type === 'person'">
             <on-the-fly-person
                v-bind:id="id"
@@ -24,7 +24,7 @@
                ref="castPerson">
             </on-the-fly-person>
          </template>
-         
+
          <template v-slot:body v-else-if="type === 'thirdparty'">
             <on-the-fly-thirdparty
                v-bind:id="id"
@@ -33,31 +33,29 @@
                ref="castThirdparty">
             </on-the-fly-thirdparty>
          </template>
-         
+
          <template v-slot:body v-else>
             <on-the-fly-create
                v-bind:action="action"
                ref="castNew">
             </on-the-fly-create>
          </template>
-            
+
          <template v-slot:footer>
             <button v-if="action === 'show'"
                @click="changeActionTo('edit')"
-               class="btn btn-update"> <!-- @click.prevent="$emit('..', ..)" -->
+               class="btn btn-update">
             </button>
             <button v-else
                class="btn btn-save"
-               @click="saveAction"
-               > <!--  
-               -->
+               @click="saveAction">
                {{ $t('action.save')}}
             </button>
          </template>
-         
+
       </modal>
    </teleport>
-   
+
 </template>
 
 <script>
@@ -128,7 +126,7 @@ export default {
       },
       changeActionTo(action) {
          // [BUG] clic first on show item button; in modal clic edit button; close modal; clic again on show item button
-         this.$data.action = action; 
+         this.$data.action = action;
       },
       saveAction() {
          console.log('saveAction');
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index 3964a85fe..46ce7d900 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -32,6 +32,8 @@ const messages = {
          remove: "Enlever",
          delete: "Supprimer",
          save: "Enregistrer",
+         valid: "Valider",
+         valid_and_see: "Valider et voir",
          add: "Ajouter",
          show_modal: "Ouvrir une modale",
          ok: "OK",
@@ -61,7 +63,7 @@ const messages = {
             title: "Création d'un nouvel usager ou d'un tiers professionnel",
             person: "un nouvel usager",
             thirdparty: "un nouveau tiers professionnel"
-         },         
+         },
       },
    }
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
index 7e1c47da4..4628e3cb5 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -71,12 +71,12 @@
 
 {% macro validity(address, options) %}
     {%- if options['with_valid_from'] == true -%}
-        <span class="address-valid address-since">
+        <span class="address-valid date-since">
             {{ 'Since %date%'|trans( { '%date%' : address.validFrom|format_date('long') } ) }}
         </span>
     {%- endif -%}
     {%- if options['with_valid_to'] == true -%}
-        <span class="address-valid address-until">
+        <span class="address-valid date-until">
             {{ 'Until %date%'|trans( { '%date%' : address.validTo|format_date('long') } ) }}
         </span>
     {%- endif -%}
diff --git a/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
new file mode 100644
index 000000000..e4061cea1
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Chill\MainBundle\Search\Entity;
+
+use Chill\MainBundle\Repository\UserRepository;
+use Chill\MainBundle\Search\SearchApiInterface;
+use Chill\MainBundle\Search\SearchApiQuery;
+
+class SearchUserApiProvider implements SearchApiInterface
+{
+    private UserRepository $userRepository;
+
+    /**
+     * @param UserRepository $userRepository
+     */
+    public function __construct(UserRepository $userRepository)
+    {
+        $this->userRepository = $userRepository;
+    }
+
+    public function provideQuery(string $pattern, array $parameters): SearchApiQuery
+    {
+        $query = new SearchApiQuery();
+        $query
+            ->setSelectKey("user")
+            ->setSelectJsonbMetadata("jsonb_build_object('id', u.id)")
+            ->setSelectPertinence("GREATEST(SIMILARITY(LOWER(UNACCENT(?)), u.usernamecanonical),
+                SIMILARITY(LOWER(UNACCENT(?)), u.emailcanonical))", [ $pattern, $pattern ])
+            ->setFromClause("users AS u")
+            ->setWhereClause("SIMILARITY(LOWER(UNACCENT(?)), u.usernamecanonical) > 0.15
+                OR
+                SIMILARITY(LOWER(UNACCENT(?)), u.emailcanonical) > 0.15
+            ", [ $pattern, $pattern ]);
+
+        return $query;
+    }
+
+    public function supportsTypes(string $pattern, array $types, array $parameters): bool
+    {
+        return \in_array('user', $types);
+    }
+
+    public function prepare(array $metadatas): void
+    {
+        $ids = \array_map(fn($m) => $m['id'], $metadatas);
+
+        $this->userRepository->findBy([ 'id' => $ids ]);
+    }
+
+    public function supportsResult(string $key, array $metadatas): bool
+    {
+        return $key === 'user';
+    }
+
+    public function getResult(string $key, array $metadata, float $pertinence)
+    {
+        return $this->userRepository->find($metadata['id']);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApi.php b/src/Bundle/ChillMainBundle/Search/SearchApi.php
index 677286f1f..d59193114 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApi.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApi.php
@@ -2,6 +2,7 @@
 
 namespace Chill\MainBundle\Search;
 
+use Chill\MainBundle\Search\Entity\SearchUserApiProvider;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\PersonBundle\Search\SearchPersonApiProvider;
@@ -25,12 +26,14 @@ class SearchApi
         EntityManagerInterface $em,
         SearchPersonApiProvider $searchPerson,
         ThirdPartyApiSearch $thirdPartyApiSearch,
+        SearchUserApiProvider $searchUser,
         PaginatorFactory $paginator
     )
     {
         $this->em = $em;
         $this->providers[] = $searchPerson;
         $this->providers[] = $thirdPartyApiSearch;
+        $this->providers[] = $searchUser;
         $this->paginator = $paginator;
     }
 
@@ -41,6 +44,10 @@ class SearchApi
     {
         $queries = $this->findQueries($pattern, $types, $parameters);
 
+        if (0 === count($queries)) {
+            throw new SearchApiNoQueryException($pattern, $types, $parameters);
+        }
+
         $total = $this->countItems($queries, $types, $parameters);
         $paginator = $this->paginator->create($total);
 
@@ -49,9 +56,7 @@ class SearchApi
         $this->prepareProviders($rawResults);
         $results = $this->buildResults($rawResults);
 
-        $collection = new Collection($results, $paginator);
-
-        return $collection;
+        return new Collection($results, $paginator);
     }
 
     private function findQueries($pattern, array $types, array $parameters): array
@@ -77,7 +82,7 @@ class SearchApi
         $rsmCount->addScalarResult('count', 'count');
         $countNq = $this->em->createNativeQuery($countQuery, $rsmCount);
         $countNq->setParameters($parameters);
-        
+
         return $countNq->getSingleScalarResult();
     }
 
@@ -130,7 +135,7 @@ class SearchApi
 
         $nq = $this->em->createNativeQuery($union, $rsm);
         $nq->setParameters($parameters);
-        
+
         return $nq->getResult();
     }
 
@@ -142,7 +147,7 @@ class SearchApi
                 if ($p->supportsResult($r['key'], $r['metadata'])) {
                     $metadatas[$k][] = $r['metadata'];
                     break;
-                } 
+                }
             }
         }
 
@@ -161,7 +166,7 @@ class SearchApi
                             $p->getResult($r['key'], $r['metadata'], $r['pertinence'])
                         );
                     break;
-                } 
+                }
             }
         }
 
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php b/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
new file mode 100644
index 000000000..765650074
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Chill\MainBundle\Search;
+
+use Throwable;
+
+class SearchApiNoQueryException extends \RuntimeException
+{
+    private string $pattern;
+    private array $types;
+    private array $parameters;
+
+    public function __construct(string $pattern = "", array $types = [], array $parameters = [], $code = 0, Throwable $previous = null)
+    {
+        $typesStr = \implode(", ", $types);
+        $message = "No query for this search: pattern : {$pattern}, types: {$typesStr}";
+        $this->pattern = $pattern;
+        $this->types = $types;
+        $this->parameters = $parameters;
+
+        parent::__construct($message, $code, $previous);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
index 775407847..3dd8c8736 100644
--- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
@@ -127,8 +127,6 @@ paths:
         - person
         - thirdparty
       description: >
-        **Warning**: This is currently a stub (not really implemented
-
         The search is performed across multiple entities. The entities must be listed into
         `type` parameters.
 
@@ -152,6 +150,7 @@ paths:
               enum:
                 - person
                 - thirdparty
+                - user
       responses:
         200:
           description: "OK"
diff --git a/src/Bundle/ChillMainBundle/config/services/search.yaml b/src/Bundle/ChillMainBundle/config/services/search.yaml
index 672c956c5..38e421eaf 100644
--- a/src/Bundle/ChillMainBundle/config/services/search.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/search.yaml
@@ -7,3 +7,8 @@ services:
     Chill\MainBundle\Search\SearchApi:
         autowire: true
         autoconfigure: true
+
+    Chill\MainBundle\Search\Entity\:
+        autowire: true
+        autoconfigure: true
+        resource: '../../Search/Entity'
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
index f59fc567e..edf94bd67 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
@@ -99,6 +99,22 @@ class Household
         return $this;
     }
 
+    /**
+     * Force an address starting at the current day
+     * on the Household.
+     *
+     * This will force the startDate's address on today.
+     *
+     * Used on household creation.
+     *
+     * @Serializer\Groups({"create"})
+     */
+    public function setForceAddress(Address $address)
+    {
+       $address->setValidFrom(new \DateTime('today'));
+       $this->addAddress($address);
+    }
+
     /**
      * @param Address $address
      */
@@ -128,7 +144,7 @@ class Household
         $at = $at === null ? new \DateTime('today') : $at;
 
         $addrs = $this->getAddresses()->filter(function (Address $a) use ($at) {
-            return $a->getValidFrom() < $at && (
+            return $a->getValidFrom() <= $at && (
                 NULL === $a->getValidTo() || $at < $a->getValidTo()
             );
         });
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/< b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/<
new file mode 100644
index 000000000..f2917b463
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/<
@@ -0,0 +1,374 @@
+import { createStore } from 'vuex';
+import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod, fetchAddressSuggestionByPerson} from './../api.js';
+import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
+
+const debug = process.env.NODE_ENV !== 'production';
+
+const concerned = window.household_members_editor_data.persons.map(p => {
+  return {
+    person: p,
+    position: null,
+    allowRemove: false,
+    holder: false,
+    comment: "",
+  };
+});
+
+console.log('expand suggestions', window.household_members_editor_expand_suggestions === 1);
+
+const store = createStore({
+  strict: debug,
+  state: {
+    concerned,
+    household: window.household_members_editor_data.household,
+    positions: window.household_members_editor_data.positions.sort((a, b) => {
+        if (a.ordering < b.ordering) {
+          return -1;
+        }
+        if (a.ordering > b.ordering) {
+          return 1;
+        }
+        return 0;
+      }),
+    startDate: new Date(),
+    allowHouseholdCreate: window.household_members_editor_data.allowHouseholdCreate,
+    allowHouseholdSearch: window.household_members_editor_data.allowHouseholdSearch,
+    allowLeaveWithoutHousehold: window.household_members_editor_data.allowLeaveWithoutHousehold,
+    forceLeaveWithoutHousehold: false,
+    householdSuggestionByAccompanyingPeriod: [],
+    showHouseholdSuggestion: window.household_members_editor_expand_suggestions === 1,
+    addressesSuggestion: [],
+    warnings: [],
+    errors: []
+  },
+  getters: {
+    isHouseholdNew(state) {
+      if (state.household === null) {
+        return false;
+      }
+      return !Number.isInteger(state.household.id);
+    },
+    hasHousehold(state) {
+      return state.household !== null;
+    },
+    hasHouseholdOrLeave(state) {
+      return state.household !== null || state.forceLeaveWithoutHousehold;
+    },
+    hasHouseholdSuggestion(state, getters) {
+      return getters.filterHouseholdSuggestionByAccompanyingPeriod.length > 0;
+    },
+    countHouseholdSuggestion(state, getters) {
+      return getters.filterHouseholdSuggestionByAccompanyingPeriod.length;
+    },
+    filterHouseholdSuggestionByAccompanyingPeriod(state) {
+      if (state.household === null) {
+        return state.householdSuggestionByAccompanyingPeriod;
+      }
+
+      return state.householdSuggestionByAccompanyingPeriod
+        .filter(h => h.id !== state.household.id)
+        ;
+    },
+    hasPersonsWellPositionnated(state, getters) {
+      return getters.needsPositionning === false
+        || (getters.persons.length > 0 && getters.concUnpositionned.length === 0);
+    },
+    persons(state) {
+      return state.concerned.map(conc => conc.person);
+    },
+    concUnpositionned(state) {
+      return state.concerned
+        .filter(conc => conc.position === null)
+      ;
+    },
+    positions(state) {
+      return state.positions;
+    },
+    personByPosition: (state) => (position_id) => {
+      return state.concerned
+        .filter(conc =>
+          conc.position !== null ? conc.position.id === position_id : false
+        )
+        .map(conc => conc.person)
+      ;
+    },
+    concByPosition: (state) => (position_id) => {
+      return state.concerned
+        .filter(conc =>
+          conc.position !== null ? conc.position.id === position_id : false
+        )
+      ;
+    },
+    concByPersonId: (state) => (person_id) => {
+      return state.concerned
+        .find(conc => conc.person.id === person_id)
+      ;
+    },
+    needsPositionning(state) {
+      return state.forceLeaveWithoutHousehold === false;
+    },
+    buildPayload: (state) => {
+      let
+        conc,
+        payload_conc,
+        payload = {
+          concerned: [],
+          destination: null
+        }
+      ;
+
+      if (state.forceLeaveWithoutHousehold === false) {
+        payload.destination = {
+            id: state.household.id,
+            type: state.household.type
+          };
+      }
+
+      for (let i in state.concerned) {
+        conc = state.concerned[i];
+        payload_conc = {
+          person: {
+            id: conc.person.id,
+            type: conc.person.type
+          },
+          start_date: {
+            datetime: datetimeToISO(state.startDate)
+          }
+        };
+
+        if (state.forceLeaveWithoutHousehold === false) {
+          payload_conc.position = {
+            id: conc.position.id,
+            type: conc.position.type
+          };
+          payload_conc.holder = conc.holder;
+          payload_conc.comment = conc.comment;
+        }
+
+        payload.concerned.push(payload_conc);
+      }
+
+      return payload;
+    },
+  },
+  mutations: {
+    addConcerned(state, person) {
+      let persons = state.concerned.map(conc => conc.person.id);
+      if (!persons.includes(person.id)) {
+        state.concerned.push({
+          person,
+          position: null,
+          allowRemove: true,
+          holder: false,
+          comment: "",
+        });
+      } else {
+        console.err("person already included");
+      }
+    },
+    markPosition(state, { person_id, position_id}) {
+      let
+        position = state.positions.find(pos => pos.id === position_id),
+        conc = state.concerned.find(c => c.person.id === person_id);
+      conc.position = position;
+    },
+    setComment(state, {conc, comment}) {
+      conc.comment = comment;
+    },
+    toggleHolder(state, conc) {
+      conc.holder = !conc.holder;
+    },
+    removePosition(state, conc) {
+      conc.holder = false;
+      conc.position = null;
+    },
+    removeConcerned(state, conc) {
+      state.concerned = state.concerned.filter(c =>
+        c.person.id !== conc.person.id
+      )
+    },
+    createHousehold(state) {
+      state.household = { type: 'household', members: [], current_address: null, 
+        current_members_id: [] };
+      state.forceLeaveWithoutHousehold = false;
+    },
+    removeHousehold(state) {
+      state.household = null;
+      state.forceLeaveWithoutHousehold = false;
+    },
+    setHouseholdAddress(state, address) {
+      if (null === state.household) {
+        console.error("no household");
+        throw new Error("No household");
+      }
+
+      state.household.current_address = address;
+      state.household.force_new_address = address;
+    },
+    forceLeaveWithoutHousehold(state) {
+      state.household = null;
+      state.forceLeaveWithoutHousehold = true;
+    },
+    selectHousehold(state, household) {
+      state.household = household;
+      state.forceLeaveWithoutHousehold = false;
+    },
+    setHouseholdSuggestionByAccompanyingPeriod(state, households) {
+      let existingIds = state.householdSuggestionByAccompanyingPeriod
+        .map(h => h.id);
+      for (let i in households) {
+        if (!existingIds.includes(households[i].id)) {
+          state.householdSuggestionByAccompanyingPeriod.push(households[i]);
+        }
+      }
+    },
+    setStartDate(state, dateI) {
+      state.startDate = dateI;
+    },
+    toggleHouseholdSuggestion(state) {
+      state.showHouseholdSuggestion = !state.showHouseholdSuggestion;
+    },
+    setWarnings(state, warnings) {
+      state.warnings = warnings;
+      // reset errors, which should come from servers
+      state.errors.splice(0, state.errors.length);
+    },
+    setErrors(state, errors) {
+      state.errors = errors;
+    },
+    addAddressesSuggestion(state, addresses) {
+      let existingIds = state.addressesSuggestion
+        .map(a => a.id);
+
+      for (let i in addresses) {
+        if (!existingIds.includes(addresses[i].id)) {
+          state.addressesSuggestion.push(addresses[i]);
+        }
+      }
+    }
+  },
+  actions: {
+    addConcerned({ commit, dispatch }, person) {
+      commit('addConcerned', person);
+      dispatch('computeWarnings');
+      dispatch('fetchAddressSuggestions');
+    },
+    markPosition({ commit, state, dispatch }, { person_id, position_id }) {
+      commit('markPosition', { person_id, position_id });
+      dispatch('computeWarnings');
+    },
+    toggleHolder({ commit, dispatch }, conc) {
+      commit('toggleHolder', conc);
+      dispatch('computeWarnings');
+    },
+    removePosition({ commit, dispatch }, conc) {
+      commit('removePosition', conc);
+      dispatch('computeWarnings');
+    },
+    removeConcerned({ commit, dispatch }, conc) {
+      commit('removeConcerned', conc);
+      dispatch('computeWarnings');
+      dispatch('fetchAddressSuggestions');
+    },
+    removeHousehold({ commit, dispatch }) {
+      commit('removeHousehold');
+      dispatch('computeWarnings');
+    },
+    createHousehold({ commit, dispatch }) {
+      commit('createHousehold');
+      dispatch('computeWarnings');
+    },
+    forceLeaveWithoutHousehold({ commit, dispatch }) {
+      commit('forceLeaveWithoutHousehold');
+      dispatch('computeWarnings');
+    },
+    selectHousehold({ commit }, h) {
+      commit('selectHousehold', h);
+      dispatch('computeWarnings');
+    },
+    setStartDate({ commit, dispatch }, date) {
+      commit('setStartDate', date);
+      dispatch('computeWarnings');
+    },
+    setComment({ commit }, payload) {
+      commit('setComment', payload);
+    },
+    fetchHouseholdSuggestionForConcerned({ commit, state }, person) {
+      fetchHouseholdSuggestionByAccompanyingPeriod(person.id)
+        .then(households => {
+          commit('setHouseholdSuggestionByAccompanyingPeriod', households);
+        });
+    },
+    fetchAddressSuggestions({ commit, state }) {
+      for (let i in state.concerned) {
+        fetchAddressSuggestionByPerson(state.concerned[i].person.id)
+          .then(addresses => {
+            commit('addAddressesSuggestion', addresses);
+          })
+          .catch(e => {
+            console.log(e);
+          });
+      }
+    },
+    computeWarnings({ commit, state, getters }) {
+      let warnings = [],
+        payload;
+
+      if (!getters.hasHousehold && !state.forceLeaveWithoutHousehold) {
+        warnings.push({ m: 'household_members_editor.add_destination', a: {} });
+      }
+
+      if (state.concerned.length === 0) {
+        warnings.push({ m: 'household_members_editor.add_at_least_onePerson', a: {} });
+      }
+
+      if (getters.concUnpositionned.length > 0
+        && !state.forceLeaveWithoutHousehold) {
+        warnings.push({ m: 'household_members_editor.give_a_position_to_every_person', a: {} })
+      }
+
+      commit('setWarnings', warnings);
+    },
+    confirm({ getters, state, commit }) {
+      let payload = getters.buildPayload,
+        errors = [],
+        person_id,
+        household_id,
+        error
+      ;
+
+        householdMove(payload).then(household => {
+          if (household === null) {
+            person_id = getters.persons[0].id;
+            window.location.replace(`/fr/person/${person_id}/general`);
+          } else {
+            if (household.type === 'household') {
+              household_id = household.id;
+              // nothing to do anymore here, bye-bye !
+              window.location.replace(`/fr/person/household/${household_id}/summary`);
+            } else {
+              // we assume the answer was 422...
+              error = household;
+              for (let i in error.violations) {
+                let e = error.violations[i];
+                errors.push(e.title);
+              }
+
+              commit('setErrors', errors);
+            }
+          }
+      });
+    },
+  }
+});
+
+store.dispatch('computeWarnings');
+store.dispatch('fetchAddressSuggestions');
+
+if (concerned.length > 0) {
+  concerned.forEach(c => {
+    store.dispatch('fetchHouseholdSuggestionForConcerned', c.person);
+  });
+}
+
+export { store };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
index 8f6a92584..c2d7d3946 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
@@ -9,6 +9,7 @@
    <origin-demand></origin-demand>
    <requestor></requestor>
    <social-issue></social-issue>
+   <course-location></course-location>
    <referrer></referrer>
    <resources></resources>
    <comment v-if="accompanyingCourse.step === 'DRAFT'"></comment>
@@ -24,6 +25,7 @@ import OriginDemand from './components/OriginDemand.vue';
 import PersonsAssociated from './components/PersonsAssociated.vue';
 import Requestor from './components/Requestor.vue';
 import SocialIssue from './components/SocialIssue.vue';
+import CourseLocation from './components/CourseLocation.vue';
 import Referrer from './components/Referrer.vue';
 import Resources from './components/Resources.vue';
 import Comment from './components/Comment.vue';
@@ -38,18 +40,23 @@ export default {
       PersonsAssociated,
       Requestor,
       SocialIssue,
+      CourseLocation,
       Referrer,
       Resources,
       Comment,
       Confirm,
    },
    computed: mapState([
-      'accompanyingCourse'
+      'accompanyingCourse',
+      'addressContext'
    ])
 };
 </script>
 
 <style lang="scss">
+   @import 'ChillMainAssets/module/bootstrap/shared';
+   $chill-accourse-context: #718596;
+
    div#accompanying-course {
       div.vue-component {
          h2 {
@@ -59,7 +66,7 @@ export default {
                position: absolute;
                content: "\f142";  //ellipsis-v
                font-family: "ForkAwesome";
-               color: #718596ab;
+               color: tint-color($chill-accourse-context, 10%);
                left: -22px;
                top: 4px;
             }
@@ -70,10 +77,10 @@ export default {
          }
          padding: 0em 0em;
          margin: 1em 0;
-         border: 1px dotted #718596ab;
+         border: 1px dotted tint-color($chill-accourse-context, 10%);
          border-radius: 5px;
-         border-left: 1px dotted #718596ab;
-         border-right: 1px dotted #718596ab;
+         border-left: 1px dotted tint-color($chill-accourse-context, 10%);
+         border-right: 1px dotted tint-color($chill-accourse-context, 10%);
          dd {
             margin-left: 1em;
          }
@@ -83,6 +90,5 @@ export default {
          table {
          }
       }
-
-}
+   }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js
index d315a3db7..676bbf7b7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js
@@ -4,12 +4,12 @@
 *
 *  @id   integer - id of accompanyingCourse
 */
-const getAccompanyingCourse = (id) => { 
+const getAccompanyingCourse = (id) => {
    const url = `/api/1.0/person/accompanying-course/${id}.json`;
    return fetch(url)
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw Error('Error with request resource response');
       });
 };
 
@@ -20,8 +20,8 @@ const getAccompanyingCourse = (id) => {
 *  @id     integer - id of accompanyingCourse
 *  @body   Object - dictionary with changes to post
 */
-const patchAccompanyingCourse = (id, body) => { 
-   console.log('body', body);
+const patchAccompanyingCourse = (id, body) => {
+   //console.log('body', body);
    const url = `/api/1.0/person/accompanying-course/${id}.json`;
    return fetch(url, {
          method: 'PATCH',
@@ -32,7 +32,7 @@ const patchAccompanyingCourse = (id, body) => {
       })
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw Error('Error with request resource response');
       });
 };
 
@@ -47,24 +47,24 @@ const confirmAccompanyingCourse = (id) => {
       })
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw Error('Error with request resource response');
       });
 };
 
 /*
-* Endpoint 
+* Endpoint
 */
 const getSocialIssues = () => {
    const url = `/api/1.0/person/social-work/social-issue.json`;
    return fetch(url)
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw Error('Error with request resource response');
       });
 };
 
 /*
-* Endpoint v.2 chill_api_single_accompanying_course_participation, 
+* Endpoint v.2 chill_api_single_accompanying_course_participation,
 * method POST/DELETE, add/close a participation to the accompanyingCourse
 *
 *  @id               integer - id of accompanyingCourse
@@ -83,12 +83,12 @@ const postParticipation = (id, payload, method) => {
       })
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw Error('Error with request resource response');
       });
 };
 
 /*
-* Endpoint v.2 chill_api_single_accompanying_course_requestor, 
+* Endpoint v.2 chill_api_single_accompanying_course_requestor,
 * method POST/DELETE, add/close a requestor to the accompanyingCourse
 *
 *  @id               integer - id of accompanyingCourse
@@ -109,12 +109,12 @@ const postRequestor = (id, payload, method) => {
       })
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw Error('Error with request resource response');
       });
 };
 
 /*
-* Endpoint v.2 chill_api_single_accompanying_course_resource, 
+* Endpoint v.2 chill_api_single_accompanying_course_resource,
 * method POST/DELETE, add/remove a resource to the accompanyingCourse
 *
 *  @id               integer - id of accompanyingCourse
@@ -126,11 +126,11 @@ const postResource = (id, payload, method) => {
    const body = { type: "accompanying_period_resource" };
    switch (method) {
       case 'DELETE':
-         body['id'] = payload.id; 
+         body['id'] = payload.id;
          break;
       default:
          body['resource'] = { type: payload.type, id: payload.id };
-   }   
+   }
    //console.log('body', body);
    const url = `/api/1.0/person/accompanying-course/${id}/resource.json`;
    return fetch(url, {
@@ -142,7 +142,7 @@ const postResource = (id, payload, method) => {
       })
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw Error('Error with request resource response');
       });
 };
 
@@ -150,7 +150,7 @@ const postResource = (id, payload, method) => {
 * Endpoint to Add/remove SocialIssue
 */
 const postSocialIssue = (id, body, method) => {
-   //console.log('api body and method', body, method); 
+   //console.log('api body and method', body, method);
    const url = `/api/1.0/person/accompanying-course/${id}/socialissue.json`;
    return fetch(url, {
          method: method,
@@ -161,7 +161,7 @@ const postSocialIssue = (id, body, method) => {
       })
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw Error('Error with request resource response');
       });
 };
 
@@ -170,7 +170,7 @@ const getUsers = () => {
    return fetch(url)
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw Error('Error with request resource response');
       });
 };
 
@@ -179,7 +179,7 @@ const whoami = () => {
    return fetch(url)
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw Error('Error with request resource response');
       });
 };
 
@@ -188,11 +188,11 @@ const getListOrigins = () => {
    return fetch(url)
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw Error('Error with request resource response');
       });
 }
 
-export { 
+export {
    getAccompanyingCourse,
    patchAccompanyingCourse,
    confirmAccompanyingCourse,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
index eda06b285..9fe6fe87c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
@@ -5,7 +5,8 @@
    </teleport>
 
    <teleport to="#header-accompanying_course-name #banner-status">
-      <span v-if="accompanyingCourse.step === 'DRAFT'" class="d-md-block">
+      <span v-if="accompanyingCourse.step === 'DRAFT'"
+         class="text-md-end d-md-block">
          <span class="badge bg-secondary">
             {{ $t('course.step.draft') }}
          </span>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
new file mode 100644
index 000000000..c2f50c489
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
@@ -0,0 +1,68 @@
+<template>
+   <li>
+      <button class="btn btn-sm btn-secondary"
+         @click="modal.showModal = true"
+         :title="$t('courselocation.assign_course_address')">
+         <i class="fa fa-map-marker"></i>
+      </button>
+   </li>
+
+   <teleport to="body">
+      <modal v-if="modal.showModal" :modalDialogClass="modal.modalDialogClass" @close="modal.showModal = false">
+         <template v-slot:header>
+            <h2 class="modal-title">{{ $t('courselocation.sure') }}</h2>
+         </template>
+         <template v-slot:body>
+            <show-address :address="person.current_household_address"></show-address>
+            <p>{{ $t('courselocation.sure_description') }}</p>
+         </template>
+         <template v-slot:footer>
+            <button class="btn btn-danger" @click="assignAddress">
+               {{ $t('courselocation.ok') }}
+            </button>
+         </template>
+      </modal>
+   </teleport>
+</template>
+
+<script>
+import {mapState} from "vuex";
+import Modal from 'ChillMainAssets/vuejs/_components/Modal';
+import ShowAddress from "ChillMainAssets/vuejs/Address/components/ShowAddress";
+
+export default {
+   name: "ButtonLocation",
+   components: {
+      ShowAddress,
+      Modal,
+   },
+   props: ['person'],
+   data() {
+      return {
+         modal: {
+            showModal: false,
+            modalDialogClass: "modal-dialog-centered modal-md"
+         }
+      }
+   },
+   computed: {
+      ...mapState({
+         context: state => state.addressContext
+      }),
+   },
+   methods: {
+      assignAddress() {
+        //console.log('assignAddress id', this.person.current_household_address);
+         let payload = {
+            entity: this.context.entity.type,
+            entityId: this.context.entity.id,
+            locationStatusTo: 'person',
+            personId: this.person.id
+         };
+         this.$store.dispatch('updateLocation', payload);
+         window.location.assign('#section-50');
+         this.modal.showModal = false;
+      }
+   }
+}
+</script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index 90c52ceb0..b42fe8453 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -1,57 +1,63 @@
 <template>
    <div class="vue-component">
-      <h2><a name="section-60"></a>{{ $t('comment.title') }}</h2>
-      
+      <h2><a name="section-80"></a>{{ $t('comment.title') }}</h2>
+
       <!--div class="error flash_message" v-if="errors.length > 0">
          {{ errors[0] }}
          TODO fix errors flashbag for app component
       </div-->
-      
+
       <div>
          <form @submit.prevent="submitform">
-            
-            <label for="content">{{ $t('comment.label') }}</label>
-            
-            <div v-if="initialComment">
-               {{ $t('comment.created_by', [
-                  initialComment.creator.text, 
-                  $d(initialComment.createdAt.datetime, 'long')
-               ]) }}
-            </div>
-            
-            <textarea 
-               name="content" 
+
+            <label class="col-form-label" for="content">{{ $t('comment.label') }}</label>
+
+            <ckeditor
+               name="content"
                v-bind:placeholder="$t('comment.content')"
-               rows="8" 
-               cols="80"
-               ckeditor="ckeditor"
-               v-model="content">
-            </textarea>
-            
+               :editor="editor"
+               v-model="content"
+               tag-name="textarea">
+            </ckeditor>
+
+            <div v-if="initialComment" class="metadata">
+               {{ $t('comment.created_by', [
+               initialComment.creator.text,
+               $d(initialComment.createdAt.datetime, 'long')
+            ]) }}
+            </div>
+
             <ul class="record_actions">
                <li>
                   <button type="submit" class="btn btn-save">{{ $t('action.save') }}</button>
                </li>
                <li v-if="initialComment !== null">
-                  <a class="btn btn-delete" 
+                  <a class="btn btn-delete"
                      @click="removeComment">
                      {{ $t('action.delete') }}
                   </a>
                </li>
             </ul>
-            
+
          </form>
       </div>
-      
+
    </div>
 </template>
 
 <script>
+import CKEditor from '@ckeditor/ckeditor5-vue';
+import ClassicEditor from "ChillMainAssets/module/ckeditor5";
+
 export default {
    name: "Comment",
+   components: {
+      ckeditor: CKEditor.component,
+   },
    data() {
       return {
-         formdata: { 
+         editor: ClassicEditor,
+         formdata: {
             type: "accompanying_period_comment",
             content: ''
          }
@@ -66,7 +72,7 @@ export default {
             this.formdata.content = value;
          },
          get() {
-            return (this.initialComment)? this.initialComment.content : null;
+            return (this.initialComment)? this.initialComment.content : {};
          }
       },
       errors() {
@@ -75,12 +81,12 @@ export default {
    },
    methods: {
       submitform() {
-         console.log('submit');
+        //console.log('submit');
          this.$store.dispatch('postFirstComment', this.formdata);
       },
       removeComment() {
-         console.log('remove');
-         this.$store.dispatch('postFirstComment', null);
+        //console.log('remove');
+         this.$store.dispatch('postFirstComment', {});
       }
    }
 }
@@ -88,12 +94,11 @@ export default {
 * TODO
 * - [x] delete button in ul record_actions, but not in form
 * - [ ] display updatedAt => initialComment fetch PATCH content changes MUST NOT change object id !!
-* - [ ] ckeditor integration
 */
 </script>
 
-<style lang="scss" scoped>
-   div.vue-component > div {
-      //margin: 1em;
-   }
+<style lang="scss">
+div.ck-editor.ck-reset {
+   margin: 0.6em 0;
+}
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
index 7beb7b029..13752f383 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="vue-component">
-   <h2><a name="section-70"></a>
+   <h2><a name="section-90"></a>
       {{ $t('confirm.title') }}
    </h2>
 
@@ -13,7 +13,7 @@
          {{ $t('confirm.text_active') }}
          <span class="badge bg-primary">{{ $t('course.step.active') }}</span>
       </p>
-      
+
       <ul class="record_actions">
          <li>
             <button class="btn btn-save" @click="modal.showModal = true">
@@ -65,9 +65,9 @@ export default {
    },
    methods: {
       confirmCourse() {
-         console.log('@@ CLICK confirmCourse');
+        //console.log('@@ CLICK confirmCourse');
          this.$store.dispatch('confirmAccompanyingCourse');
-         console.log('confirm last');
+        //console.log('confirm last');
       }
    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
new file mode 100644
index 000000000..b9a4e111d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -0,0 +1,147 @@
+<template>
+   <div class="vue-component">
+      <h2><a name="section-50"></a>
+         {{ $t('courselocation.title') }}
+      </h2>
+      <div class="my-4">
+
+         <!-- {# include vue_address component #} -->
+         <div v-for="error in displayErrors" class="alert alert-danger my-2">
+            {{ error }}
+         </div>
+
+         <show-address
+            v-if="accompanyingCourse.location"
+            :address="accompanyingCourse.location">
+         </show-address>
+
+         <div v-if="isPersonLocation" class="alert alert-success">
+            {{ $t('courselocation.person_locator', [ accompanyingCourse.personLocation.text ]) }}
+         </div>
+
+         <div v-if="isTemporaryAddress" class="alert alert-warning">
+            <p>{{ $t('courselocation.temporary_address_must_be_changed') }}</p>
+         </div>
+
+         <ul class="record_actions">
+            <li>
+               <add-address
+                  v-if="!isPersonLocation"
+                  :context="context"
+                  :key="addAddress.type"
+                  :options="addAddress.options"
+                  :result="addAddress.result"
+                  @submitAddress="submitTemporaryAddress"
+                  ref="addAddress">
+               </add-address>
+            </li>
+            <li v-if="isPersonLocation">
+               <button
+                  class="btn btn-remove"
+                  @click="removeAddress"
+                  :title="$t('courselocation.remove_button')">
+               </button>
+            </li>
+         </ul>
+
+      </div>
+   </div>
+</template>
+
+<script>
+import { mapState } from "vuex";
+import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
+
+export default {
+   name: "CourseLocation",
+   components: {
+      AddAddress,
+      ShowAddress
+   },
+   data() {
+      return {
+         addAddress: {
+            type: 'accompanying_course_location',
+            options: {
+               /// Options override default.
+               /// null value take default component value
+               button: {
+                  text:  {
+                     create: 'courselocation.add_temporary_address',
+                     edit: 'courselocation.edit_temporary_address'
+                  }
+               },
+               title: {
+                  create: 'courselocation.add_temporary_address',
+                  edit: 'courselocation.edit_temporary_address'
+               },
+               /// Display each step in page or Modal
+               bindModal: {
+                  //step1: false, step2: false
+               },
+               hideDateFrom: true
+            }
+         }
+      }
+   },
+   computed: {
+      ...mapState({
+         accompanyingCourse: state => state.accompanyingCourse,
+         context: state => state.addressContext
+      }),
+      isTemporaryAddress() {
+         return this.accompanyingCourse.locationStatus === 'address';
+      },
+      isPersonLocation() {
+         return this.accompanyingCourse.locationStatus === 'person';
+      },
+      isContextEdit() {
+         return this.context.edit;
+      }
+   },
+   methods: {
+      initAddressContext() {
+         let context = {
+            entity: {
+               type: this.accompanyingCourse.type,
+               id: this.accompanyingCourse.id
+            },
+            edit: false,
+            addressId: null
+         }
+         if (this.accompanyingCourse.location) {
+            context['edit'] = true;
+            context['addressId'] = this.accompanyingCourse.location.address_id
+         }
+         this.$store.commit('setAddressContext', context);
+      },
+      removeAddress() {
+        //console.log('remove address');
+         let payload = {
+            entity: this.context.entity.type,
+            entityId: this.context.entity.id,
+            locationStatusTo: 'none'
+         };
+         this.$store.dispatch('updateLocation', payload);
+      },
+      displayErrors() {
+         return this.$refs.addAddress.errorMsg;
+      },
+      submitTemporaryAddress() {
+        //console.log('@@@ click on Submit Temporary Address Button');
+         let payload = this.$refs.addAddress.submitNewAddress();
+         payload['locationStatusTo'] = 'address'; // <== temporary, not none, not person
+         this.$store.dispatch('updateLocation', payload);
+         this.$store.commit('setEditContextTrue');
+      }
+   },
+   mounted() {
+      this.initAddressContext();
+
+     //console.log('ac.locationStatus', this.accompanyingCourse.locationStatus);
+     //console.log('ac.location (temporary location)', this.accompanyingCourse.location);
+     //console.log('ac.personLocation', this.accompanyingCourse.personLocation);
+   }
+}
+</script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue
index f55eb39d7..1804529ba 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue
@@ -1,7 +1,7 @@
 <template>
    <div class="vue-component">
-      <h2><a name="section-15"></a>{{ $t('origin.title') }}</h2>
-     
+      <h2><a name="section-20"></a>{{ $t('origin.title') }}</h2>
+
       <div class="my-4">
          <label for="selectOrigin">
             {{ $t('origin.label') }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index 0155d89dc..67b75c33e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -1,11 +1,11 @@
 <template>
 <div class="vue-component">
    <h2><a name="section-10"></a>{{ $t('persons_associated.title')}}</h2>
-   
+
    <div>
       <label class="col-form-label">{{ $tc('persons_associated.counter', counter) }}</label>
    </div>
-   
+
    <table class="table table-bordered table-striped border-dark align-middle" v-if="participations.length > 0">
       <thead>
          <tr>
@@ -27,7 +27,7 @@
    </table>
 
    <div>
-      <add-persons 
+      <add-persons
          buttonTitle="persons_associated.add_persons"
          modalTitle="add_persons.title"
          v-bind:key="addPersons.key"
@@ -69,15 +69,15 @@ export default {
    }),
    methods: {
       removeParticipation(item) {
-         console.log('@@ CLICK remove participation: item', item);
+        //console.log('@@ CLICK remove participation: item', item);
          this.$store.dispatch('removeParticipation', item);
       },
       closeParticipation(item) {
-         console.log('@@ CLICK close participation: item', item);
+        //console.log('@@ CLICK close participation: item', item);
          this.$store.dispatch('closeParticipation', item);
       },
       addNewPersons({ selected, modal }) {
-         console.log('@@@ CLICK button addNewPersons', selected);
+        //console.log('@@@ CLICK button addNewPersons', selected);
          selected.forEach(function(item) {
                this.$store.dispatch('addParticipation', item);
             }, this
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
index 7d07c3567..6de94370b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
@@ -12,6 +12,10 @@
    </td>
    <td>
       <ul class="record_actions">
+         <button-location
+            v-if="hasCurrentHouseholdAddress"
+            v-bind:person="participation.person">
+         </button-location>
          <li>
             <on-the-fly
                v-bind:type="participation.person.type"
@@ -28,17 +32,17 @@
          </li>
          <!--li>
             <button class="btn btn-delete"
-               :title="$t('action.delete')" 
+               :title="$t('action.delete')"
                @click.prevent="$emit('remove', participation)">
             </button>
          </li-->
          <li>
             <button v-if="!participation.endDate"
-               class="btn btn-remove"
-               v-bind:title="$t('action.remove')" 
+               class="btn btn-sm btn-remove"
+               v-bind:title="$t('action.remove')"
                @click.prevent="$emit('close', participation)">
             </button>
-            <button v-else class="btn btn-remove disabled"></button>
+            <button v-else class="btn btn-sm btn-remove" disabled></button>
          </li>
       </ul>
    </td>
@@ -47,13 +51,24 @@
 
 <script>
 import OnTheFly from 'ChillMainAssets/vuejs/_components/OnTheFly.vue';
+import ButtonLocation from '../ButtonLocation.vue';
 
 export default {
    name: 'PersonItem',
    components: {
-      OnTheFly
+      OnTheFly,
+      ButtonLocation
    },
    props: ['participation'],
    emits: ['remove', 'close'],
+   computed: {
+      hasCurrentHouseholdAddress() {
+         if ( !this.participation.endDate
+            && this.participation.person.current_household_address !== null ) {
+            return true;
+         }
+         return false;
+      }
+   }
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
index 1e3e9a877..9e8199de9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="vue-component">
-   <h2><a name="section-40"></a>{{ $t('referrer.title') }}</h2>
+   <h2><a name="section-60"></a>{{ $t('referrer.title') }}</h2>
 
    <div class="my-4">
       <label class="col-form-label" for="selectReferrer">
@@ -21,7 +21,7 @@
 
       <ul class="record_actions">
          <li>
-            <button 
+            <button
                class="btn btn-create"
                type="button"
                name="button"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index dd19a7043..e682542aa 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -1,40 +1,40 @@
 <template>
 <div class="vue-component">
-   
-   <h2><a name="section-20"></a>{{ $t('requestor.title') }}</h2>
-   
+
+   <h2><a name="section-30"></a>{{ $t('requestor.title') }}</h2>
+
    <div v-if="accompanyingCourse.requestor" class="flex-table">
-      
+
       <label>
          <input type="checkbox" v-model="isAnonymous" class="me-2" /><!--  :value="value" -->
          {{ $t('requestor.is_anonymous') }}
       </label>
-      
+
       <div class="item-bloc">
          <h4>
             <span class="badge rounded-pill bg-secondary">{{ accompanyingCourse.requestor.type }}</span>
             {{ accompanyingCourse.requestor.text }}
-         </h4>   
-         
+         </h4>
+
          <dl class="content-bloc" v-if="accompanyingCourse.requestor.type === 'person'">
-            
-            <dt>{{ $t('requestor.birthdate') }}</dt>   
+
+            <dt>{{ $t('requestor.birthdate') }}</dt>
             <dd>{{ $d(accompanyingCourse.requestor.birthdate.datetime, 'short') }}</dd>
-            
-            <dt>{{ $t('requestor.center') }}</dt>   
+
+            <dt>{{ $t('requestor.center') }}</dt>
             <dd>{{ accompanyingCourse.requestor.center.name }}</dd>
-            
-            <dt>{{ $t('requestor.phonenumber') }}</dt>   
+
+            <dt>{{ $t('requestor.phonenumber') }}</dt>
             <dd>{{ accompanyingCourse.requestor.phonenumber }}</dd>
-            <dt>{{ $t('requestor.mobilenumber') }}</dt>   
+            <dt>{{ $t('requestor.mobilenumber') }}</dt>
             <dd>{{ accompanyingCourse.requestor.mobilenumber }}</dd>
          </dl>
-         
+
          <dl class="content-bloc" v-if="accompanyingCourse.requestor.type === 'thirdparty'">
-            
+
             <dt>{{ $t('requestor.address') }}</dt>
             <dd>{{ accompanyingCourse.requestor.address.text }}</dd>
-            
+
             <dt>{{ $t('requestor.location') }}</dt>
             <dd>{{ accompanyingCourse.requestor.address.postcode.name }}</dd>
          </dl>
@@ -59,17 +59,17 @@
       <ul class="record_actions">
          <li>
             <button class="btn btn-remove"
-               :title="$t('action.remove')" 
+               :title="$t('action.remove')"
                @click="removeRequestor">
                {{ $t('action.remove') }}
             </button>
          </li>
       </ul>
-   </div> 
+   </div>
    <div v-else>
       <label>{{ $t('requestor.counter') }}</label>
-   </div>  
-   
+   </div>
+
    <div>
       <add-persons v-if="accompanyingCourse.requestor === null"
          buttonTitle="requestor.add_requestor"
@@ -139,7 +139,7 @@ export default {
 
 div.flex-table {
    margin: 1em 0 0 !important;
-   & > label, 
+   & > label,
    & > ul.record_actions {
       margin: 1em 3em 0 !important;
    }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
index 6a39a138f..78e779529 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
@@ -1,12 +1,12 @@
 <template>
 <div class="vue-component">
-  
-   <h2><a name="section-50"></a>{{ $t('resources.title')}}</h2>
-   
+
+   <h2><a name="section-70"></a>{{ $t('resources.title')}}</h2>
+
    <div>
       <label class="col-form-label">{{ $tc('resources.counter', counter) }}</label>
    </div>
-   
+
    <table class="table table-bordered table-striped border-dark align-middle" v-if="resources.length > 0">
       <thead>
          <tr>
@@ -24,9 +24,9 @@
          </resource-item>
       </tbody>
    </table>
-   
+
    <div>
-      <add-persons 
+      <add-persons
         buttonTitle="resources.add_resources"
         modalTitle="resources.add_resources"
         v-bind:key="addPersons.key"
@@ -68,11 +68,11 @@ export default {
    }),
    methods: {
       removeResource(item) {
-         console.log('@@ CLICK remove resource: item', item);
+        //console.log('@@ CLICK remove resource: item', item);
          this.$store.dispatch('removeResource', item);
       },
       addNewPersons({ selected, modal }) {
-         console.log('@@@ CLICK button addNewPersons', selected);
+        //console.log('@@@ CLICK button addNewPersons', selected);
          selected.forEach(function(item) {
                this.$store.dispatch('addResource', item);
             }, this
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index b8c94c998..8ee7d4698 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -1,15 +1,15 @@
 <template>
 <tr>
-   
+
    <td>
-      <span class="badge rounded-pill bg-secondary" 
+      <span class="badge rounded-pill bg-secondary"
          v-bind:title="resource.resource.id">
          <span v-if="resource.resource.type === 'person'" >{{ $t('item.type_person') }}</span>
          <span v-if="resource.resource.type === 'thirdparty'" >{{ $t('item.type_thirdparty') }}</span>
       </span>
       {{ resource.resource.text }}
    </td>
-      
+
    <td v-if="resource.resource.type === 'person'">
       {{ $tc('person.born') }}{{ $d(resource.resource.birthdate.datetime, 'short') }}
    </td>
@@ -17,9 +17,13 @@
       {{ resource.resource.address.text }}<br>
       {{ resource.resource.address.postcode.name }}
    </td>
-   
+
    <td>
       <ul class="record_actions">
+         <button-location
+            v-if="hasCurrentHouseholdAddress"
+            v-bind:person="resource.resource">
+         </button-location>
          <li>
             <on-the-fly
                v-bind:type="resource.resource.type"
@@ -36,8 +40,8 @@
          </li>
          <li>
             <button
-               class="btn btn-remove"
-               v-bind:title="$t('action.remove')" 
+               class="btn btn-sm btn-remove"
+               v-bind:title="$t('action.remove')"
                @click.prevent="$emit('remove', resource)">
             </button>
          </li>
@@ -48,13 +52,24 @@
 
 <script>
 import OnTheFly from 'ChillMainAssets/vuejs/_components/OnTheFly.vue';
+import ButtonLocation from '../ButtonLocation.vue';
 
 export default {
    name: 'ResourceItem',
    components: {
-      OnTheFly
+      OnTheFly,
+      ButtonLocation
    },
    props: ['resource'],
-   emits: ['remove']
+   emits: ['remove'],
+   computed: {
+      hasCurrentHouseholdAddress() {
+         if ( !this.resource.resource.type === 'person'
+            && this.resource.resource.current_household_address !== null ) {
+            return true;
+         }
+         return false;
+      }
+   }
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
index f1d9b67b0..38392296e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
@@ -1,15 +1,15 @@
 <template>
   <div class="vue-component">
-     <h2><a name="section-30"></a>{{ $t('social_issue.title') }}</h2>
-     
+     <h2><a name="section-40"></a>{{ $t('social_issue.title') }}</h2>
+
      <div class="my-4">
         <!--label for="field">{{ $t('social_issue.label') }}</label
         -->
         <VueMultiselect
            name="field"
            :close-on-select="false"
-           :allow-empty="true" 
-           :show-labels="false" 
+           :allow-empty="true"
+           :show-labels="false"
            track-by="id"
            label="text"
            :multiple="true"
@@ -20,7 +20,7 @@
            :options="options">
         </VueMultiselect>
      </div>
-     
+
   </div>
 </template>
 
@@ -51,7 +51,7 @@ export default {
             //console.log('get socialIssues', response.results);
             this.options = response.results;
             resolve();
-         })).catch(error => this.$store.commit('catchError', error));        
+         })).catch(error => this.$store.commit('catchError', error));
       },
       updateSocialIssues(value) {
          this.$store.dispatch('updateSocialIssues', this.transformValue(value));
@@ -60,7 +60,7 @@ export default {
          let stored = this.value;
          let added = updated.filter(x => stored.indexOf(x) === -1).shift();
          let removed = stored.filter(x => updated.indexOf(x) === -1).shift();
-         let method = (typeof removed === 'undefined') ? 'POST' : 'DELETE';         
+         let method = (typeof removed === 'undefined') ? 'POST' : 'DELETE';
          let changed = (typeof removed === 'undefined') ? added : removed;
          let body = { type: "social_issue", id: changed.id };
          //console.log('body', body);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue
index 413f216cc..762ef1d11 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue
@@ -1,15 +1,15 @@
 <template>
-   <a 
-      v-if="item.key <= 5"
-      :href="item.name" 
+   <a
+      v-if="item.key <= 7"
+      :href="item.name"
       :class="{ 'active': isActive }"
       >
       <i class="fa fa-fw fa-square"></i>
       <span>{{ item.key }}</span>
    </a>
-   <a 
+   <a
       v-else-if="step === 'DRAFT'"
-      :href="item.name" 
+      :href="item.name"
       :class="{ 'active': isActive }"
       >
       <i class="fa fa-fw fa-square"></i>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
index bd47d4a73..e3fdec4a3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
@@ -12,11 +12,10 @@ const root = window.vueRootComponent;
 *  Load all App component, for AccompanyingCourse edition page
 */
 if (root === 'app') {
-   
    initPromise.then(store => {
-      
+
       const i18n = _createI18n(appMessages);
-      
+
       const app = createApp({
          template: `<app></app>`,
       })
@@ -31,11 +30,10 @@ if (root === 'app') {
 *  Load only Banner sub-component, for all others AccompanyingCourse page
 */
 if (root === 'banner') {
-
    initPromise.then(store => {
-      
+
       const i18n = _createI18n(appMessages);
-      
+
       const app = createApp({
          template: `<banner></banner>`,
       })
@@ -44,5 +42,5 @@ if (root === 'banner') {
       .component('banner', Banner)
       .mount('#banner-accompanying-course');
    });
-   
+
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 6e212eb15..c690534ba 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -1,4 +1,5 @@
 import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
+import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n';
 
 const appMessages = {
    fr: {
@@ -20,7 +21,7 @@ const appMessages = {
             active: "En file active"
          },
          open_at: "ouvert le ",
-         by: "par ", 
+         by: "par ",
          emergency: "urgent",
          confidential: "confidentiel",
          regular: "régulier",
@@ -63,6 +64,18 @@ const appMessages = {
          title: "Problématiques sociales",
          label: "Choisir les problématiques sociales",
       },
+      courselocation: {
+         title: "Localisation du parcours",
+         add_temporary_address: "Ajouter une adresse temporaire",
+         edit_temporary_address: "Modifier l'adresse temporaire",
+         assign_course_address: "Désigner comme l'adresse du parcours",
+         remove_button: "Enlever l'adresse",
+         temporary_address_must_be_changed: "Cette addresse est temporaire et doit être remplacée par celle d'un usager de référence.",
+         sure: "Êtes-vous sûr ?",
+         sure_description: "Voulez-vous faire de cette adresse l'adresse du parcours ?",
+         ok: "Désigner comme adresse du parcours",
+         person_locator: "Parcours localisé auprès de {0}",
+      },
       referrer: {
          title: "Référent du parcours",
          label: "Vous pouvez choisir un TMS ou vous assigner directement comme référent",
@@ -80,7 +93,7 @@ const appMessages = {
          title: "Observations",
          label: "Ajout d'une note",
          content: "Rédigez une première note…",
-         created_by: "créé par {0}, le {1}" 
+         created_by: "créé par {0}, le {1}"
       },
       confirm: {
          title: "Confirmation",
@@ -94,7 +107,7 @@ const appMessages = {
    }
 };
 
-Object.assign(appMessages.fr, personMessages.fr);
+Object.assign(appMessages.fr, personMessages.fr, addressMessages.fr);
 
 export {
    appMessages
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index e377b358a..ec2048f31 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -1,32 +1,34 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
-import { getAccompanyingCourse, 
+import { getAccompanyingCourse,
    patchAccompanyingCourse,
    confirmAccompanyingCourse,
-   postParticipation, 
+   postParticipation,
    postRequestor,
    postResource,
    postSocialIssue } from '../api';
 
+
 const debug = process.env.NODE_ENV !== 'production';
 const id = window.accompanyingCourseId;
 
 let initPromise = getAccompanyingCourse(id)
    .then(accompanying_course => new Promise((resolve, reject) => {
-            
+
       const store = createStore({
          strict: debug,
          modules: {
          },
          state: {
             accompanyingCourse: accompanying_course,
+            addressContext: {},
             errorMsg: []
          },
          getters: {
          },
          mutations: {
             catchError(state, error) {
-               state.errorMsg.push(error); 
+               state.errorMsg.push(error);
             },
             removeParticipation(state, participation) {
                //console.log('### mutation: remove participation', participation.id);
@@ -77,7 +79,7 @@ let initPromise = getAccompanyingCourse(id)
             postFirstComment(state, comment) {
                //console.log('### mutation: postFirstComment', comment);
                state.accompanyingCourse.initialComment = comment;
-            }, 
+            },
             updateSocialIssues(state, value) {
                state.accompanyingCourse.socialIssues = value;
             },
@@ -92,6 +94,20 @@ let initPromise = getAccompanyingCourse(id)
             confirmAccompanyingCourse(state, response) {
                //console.log('### mutation: confirmAccompanyingCourse: response', response);
                state.accompanyingCourse.step = response.step;
+            },
+            setAddressContext(state, context) {
+               //console.log('define location context');
+               state.addressContext = context;
+            },
+            updateLocation(state, r) {
+              //console.log('### mutation: set location attributes', r);
+               state.accompanyingCourse.location = r.location;
+               state.accompanyingCourse.locationStatus = r.locationStatus;
+               state.accompanyingCourse.personLocation = r.personLocation;
+            },
+            setEditContextTrue(state) {
+              //console.log('### mutation: set edit context = true');
+               state.addressContext.edit = true;
             }
          },
          actions: {
@@ -105,7 +121,7 @@ let initPromise = getAccompanyingCourse(id)
                .then(participation => new Promise((resolve, reject) => {
                   commit('closeParticipation', { participation, payload });
                   resolve();
-               })).catch((error) => { commit('catchError', error) }); 
+               })).catch((error) => { commit('catchError', error) });
             },
             addParticipation({ commit }, payload) {
                //console.log('## action: fetch post participation (select item): payload', payload);
@@ -113,7 +129,7 @@ let initPromise = getAccompanyingCourse(id)
                .then(participation => new Promise((resolve, reject) => {
                   commit('addParticipation', participation);
                   resolve();
-               })).catch((error) => { commit('catchError', error) }); 
+               })).catch((error) => { commit('catchError', error) });
             },
             removeRequestor({ commit, dispatch }) {
                //console.log('## action: fetch delete requestor');
@@ -122,7 +138,7 @@ let initPromise = getAccompanyingCourse(id)
                   commit('removeRequestor');
                   dispatch('requestorIsAnonymous', false);
                   resolve();
-               })).catch((error) => { commit('catchError', error) }); 
+               })).catch((error) => { commit('catchError', error) });
             },
             addRequestor({ commit }, payload) {
                //console.log('## action: fetch post requestor: payload', payload);
@@ -130,7 +146,7 @@ let initPromise = getAccompanyingCourse(id)
                .then(requestor => new Promise((resolve, reject) => {
                   commit('addRequestor', requestor);
                   resolve();
-               })).catch((error) => { commit('catchError', error) }); 
+               })).catch((error) => { commit('catchError', error) });
             },
             requestorIsAnonymous({ commit }, payload) {
                //console.log('## action: fetch patch AccompanyingCourse: payload', payload);
@@ -209,6 +225,30 @@ let initPromise = getAccompanyingCourse(id)
                   resolve();
                })).catch((error) => { commit('catchError', error) });
             },
+            updateLocation({ commit }, payload) {
+              //console.log('## action: updateLocation', payload.locationStatusTo);
+               let body = { 'type': payload.entity, 'id': payload.entityId };
+               let location = {};
+               if (payload.locationStatusTo === 'person') { // patch for person address (don't remove addressLocation)
+                  location = { 'personLocation': { 'type': 'person', 'id': payload.personId }};
+               }
+               else if (payload.locationStatusTo === 'address') { // patch for temporary address
+                  location = { 'personLocation': null, 'addressLocation': { 'id': payload.addressId }};
+               }
+               else { // patch to remove person address
+                  location = { 'personLocation': null };
+               }
+               Object.assign(body, location);
+               patchAccompanyingCourse(payload.entityId, body)
+                  .then(accompanyingCourse => new Promise((resolve, reject) => {
+                     commit('updateLocation', {
+                        location: accompanyingCourse.location,
+                        locationStatus: accompanyingCourse.locationStatus,
+                        personLocation: accompanyingCourse.personLocation
+                     });
+                     resolve();
+                  })).catch((error) => { commit('catchError', error) });
+            },
             confirmAccompanyingCourse({ commit }) {
                //console.log('## action: confirmAccompanyingCourse');
                confirmAccompanyingCourse(id)
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
deleted file mode 100644
index 0cf3a67c8..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-   <div class='household__address-move'>
-      <div class='household__address-move__create'>
-         <div>
-            <h2 v-if="!edit">{{ $t('create_a_new_address') }}</h2>
-            <h2 v-else>{{ $t('edit_a_new_address') }}</h2>
-            <add-address
-               @addNewAddress="addNewAddress">
-            </add-address>
-         </div>
-         <div>
-            <show-address
-               v-if="newAddress"
-               v-bind:address="newAddress">
-            </show-address>
-         </div>
-      </div>
-      <div v-if="!edit" class='household__address-move__valid'>
-         <h2>{{ $t('move_date') }}</h2>
-         
-         <div class="input-group mb-3">
-            <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
-            <input type="date" class="form-control form-control-lg" name="validFrom"
-               v-bind:placeholder="$t('validFrom')"
-               v-model="validFrom"
-               aria-describedby="validFrom" />
-         </div>
-         
-         <div v-if="errors.length > 0">
-            {{ errors }}
-         </div>
-         <div v-if="loading">
-            {{ $t('loading') }}
-         </div>
-         <div v-if="success && !edit">
-            {{ $t('household_address_move_success') }}
-         </div>
-      </div>
-      <div v-if="success && edit">
-         {{ $t('household_address_edit_success') }}
-      </div>
-      <div>
-         <ul class="record_actions sticky-form-buttons">
-            <li class="cancel">
-               <a :href="backUrl" class="btn btn-cancel">{{ $t('back_to_the_list') }}</a>
-            </li>
-            <li v-if="!edit">
-               <button type="submit" class="btn btn-update" @click="addToHousehold">
-                  {{ $t('add_an_address_to_household') }}
-               </button>
-            </li>
-         </ul>
-      </div>
-   </div>
-</template>
-
-<script>
-
-import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
-
-export default {
-   name: 'App',
-   components: {
-      AddAddress,
-      ShowAddress
-   },
-   data() {
-      return {
-         edit: window.mode === 'edit',
-         householdId: window.householdId,
-         addressId: window.addressId,
-         backUrl: `/fr/person/household/${householdId}/addresses`, //TODO better way to pass this
-         validFrom: new Date().toISOString().split('T')[0]
-      }
-   },
-   computed: {
-      newAddress() {
-         return this.$store.state.newAddress;
-      },
-      errors() {
-         return this.$store.state.errorMsg;
-      },
-      loading() {
-         return this.$store.state.loading;
-      },
-      success() {
-         return this.$store.state.success;
-      }
-   },
-   methods: {
-      addNewAddress({ address, modal }) {
-         console.log('@@@ CLICK button addNewAdress', address);
-
-         let createdAddress = {
-            'isNoAddress': address.isNoAddress,
-            'street': address.isNoAddress ? '' : address.street,
-            'streetNumber': address.isNoAddress ? '' : address.streetNumber,
-            'postcode': {'id': address.selected.city.id},
-            'floor': address.floor,
-            'corridor': address.corridor,
-            'steps': address.steps,
-            'flat': address.flat,
-            'buildingName': address.buildingName,
-            'distribution': address.distribution,
-            'extra': address.extra
-         };
-
-         if (address.selected.address.point !== undefined){
-            createdAddress = Object.assign(createdAddress, {
-               'point': address.selected.address.point.coordinates
-            });
-         }
-
-         if(address.writeNewPostalCode){
-            let newPostalCode = address.newPostalCode;
-            newPostalCode = Object.assign(newPostalCode, {
-                'country': {'id': address.selected.country.id },
-            });
-            createdAddress = Object.assign(createdAddress, {
-               'newPostalCode': newPostalCode
-            });
-         }
-
-         if (this.edit){
-            this.$store.dispatch('updateAddress', {
-               addressId: this.addressId,
-               newAddress: createdAddress
-            });
-         } else {
-            this.$store.dispatch('addAddress', createdAddress);
-         }
-
-         modal.showModal = false;
-      },
-      addToHousehold() {
-         this.$store.dispatch('addDateToAddressAndAddressToHousehold', {
-            householdId: this.householdId,
-            addressId: this.$store.state.newAddress.address_id,
-            body: { validFrom: {datetime: `${this.validFrom}T00:00:00+0100`}},
-            backUrl: this.backUrl
-         })
-      },
-      getEditAddress() {
-         this.$store.dispatch('getEditAddress', this.addressId);
-      }
-   },
-   mounted() {
-      if (this.edit) {
-         this.getEditAddress();
-      }
-   },
-};
-
-</script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/api.js
deleted file mode 100644
index 4fe284e5b..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/api.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-* Endpoint household
-* method POST, post Household instance
-*
-*  @id     integer - id of household
-*  @body   Object - dictionary with changes to post
-*/
-export const postAddressToHousehold = (householdId, addressId) => {
-   const body = {
-      'id': addressId
-   };
-   const url = `/api/1.0/person/household/${householdId}/address.json`
-   return fetch(url, {
-         method: 'POST',
-         headers: {'Content-Type': 'application/json;charset=utf-8'},
-         body: JSON.stringify(body)
-      })
-      .then(response => {
-         if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response');
-      });
-};
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/index.js
deleted file mode 100644
index e7a73238d..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { createApp } from 'vue'
-import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
-import { appMessages } from './js/i18n'
-import { store } from './store'
-
-import App from './App.vue';
-
-const root = window.vueRootComponent;
-
-/*
-*  Load all App component, for Household edition page
-*/
-
-const i18n = _createI18n(appMessages);
-
-const app = createApp({
-   template: `<app></app>`,
-})
-.use(store)
-.use(i18n)
-.component('app', App)
-.mount('#household-address');
-
-
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js
index f7ee56e02..d62e9add9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js
@@ -1,4 +1,4 @@
-import { addressMessages } from 'ChillMainAssets/vuejs/Address/js/i18n'
+import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n'
 
 const appMessages = {
    fr: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/store/index.js
deleted file mode 100644
index 9a3e4b866..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/store/index.js
+++ /dev/null
@@ -1,160 +0,0 @@
-import 'es6-promise/auto';
-import { createStore } from 'vuex';
-
-import { postAddress, postPostalCode, patchAddress, getAddress } from 'ChillMainAssets/vuejs/Address/api';
-import { postAddressToHousehold } from '../api';
-
-const debug = process.env.NODE_ENV !== 'production';
-
-const store = createStore({
-   strict: debug,
-   state: {
-      newAddress: {},
-      editAddress: {}, //TODO or should be newAddress?
-      household: {},
-      validFrom: {},
-      errorMsg: [],
-      loading: false,
-      success: false
-   },
-   getters: {
-   },
-   mutations: {
-      catchError(state, error) {
-         state.errorMsg.push(error);
-      },
-      addAddress(state, address) {
-         console.log('@M addAddress address', address);
-         state.newAddress = address;
-      },
-      updateAddress(state, address) {
-         console.log('@M updateAddress address', address);
-         state.newAddress = address;
-      },
-      addAddressToHousehold(state, household) {
-         console.log('@M addAddressToHousehold household', household);
-         state.household = household;
-      },
-      addDateToAddress(state, validFrom) {
-         console.log('@M addDateToAddress address.validFrom', validFrom);
-         state.validFrom = validFrom;
-      },
-      getEditAddress(state, address) {
-         console.log('@M getEditAddress address', address);
-         state.editAddress = address;
-      },
-      setLoading(state, b) {
-         state.loading = b;
-      },
-      setSuccess(state, b) {
-         state.success = b;
-      }
-   },
-   actions: {
-      addAddress({ commit }, payload) {
-         console.log('@A addAddress payload', payload);
-         commit('setLoading', true);
-         if('newPostalCode' in payload){
-            postPostalCode(payload.newPostalCode)
-               .then(postalCode => {
-                  let body = payload;
-                  body.postcode = {'id': postalCode.id },
-                  postAddress(body)
-                     .then(address => new Promise((resolve, reject) => {
-                        commit('addAddress', address);
-                        resolve();
-                        commit('setLoading', false);
-                     }))
-                     .catch((error) => {
-                        commit('catchError', error);
-                        commit('setLoading', false);
-                     });
-               })
-
-         } else {
-            postAddress(payload)
-               .then(address => new Promise((resolve, reject) => {
-                  commit('addAddress', address);
-                  resolve();
-                  commit('setLoading', false);
-               }))
-               .catch((error) => {
-                  commit('catchError', error);
-                  commit('setLoading', false);
-               });
-         }
-      },
-      addDateToAddressAndAddressToHousehold({ commit }, payload) {
-         console.log('@A addDateToAddressAndAddressToHousehold payload', payload);
-         commit('setLoading', true);
-         patchAddress(payload.addressId, payload.body)
-            .then(address => new Promise((resolve, reject) => {
-               commit('addDateToAddress', address.validFrom);
-               resolve();
-            }).then(
-               postAddressToHousehold(payload.householdId, payload.addressId)
-                  .then(household => new Promise((resolve, reject) => {
-                     commit('addAddressToHousehold', household);
-                     commit('setSuccess', true);
-                     commit('setLoading', false);
-                     window.location.assign(payload.backUrl);
-                     resolve();
-               }))
-               .catch((error) => {
-                  commit('catchError', error);
-                  commit('setLoading', false);
-               })
-            ))
-            .catch((error) => {
-               commit('catchError', error);
-               commit('setLoading', false);
-            });
-      },
-      updateAddress({ commit }, payload) {
-         console.log('@A updateAddress payload', payload);
-
-         if('newPostalCode' in payload.newAddress){ // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
-            let postalCodeBody = payload.newAddress.newPostalCode;
-            postalCodeBody = Object.assign(postalCodeBody, {'origin': 3});
-            postPostalCode(postalCodeBody)
-               .then(postalCode => {
-                  let body = payload.newAddress;
-                  body.postcode = {'id': postalCode.id },
-                  patchAddress(payload.addressId, body)
-                     .then(address => new Promise((resolve, reject) => {
-                        commit('updateAddress', address);
-                        commit('setSuccess', true);
-                        resolve();
-                     }))
-                     .catch((error) => {
-                        commit('catchError', error);
-                     });
-               })
-
-         } else {
-            patchAddress(payload.addressId, payload.newAddress)
-               .then(address => new Promise((resolve, reject) => {
-                  commit('updateAddress', address);
-                  commit('setSuccess', true);
-                  resolve();
-               }))
-               .catch((error) => {
-                  commit('catchError', error);
-               });
-         }
-      },
-      getEditAddress({ commit }, payload) {
-         console.log('@A getEditAddress payload', payload);
-
-         getAddress(payload).then(address => new Promise((resolve, reject) => {
-            commit('getEditAddress', address);
-            resolve();
-         }))
-         .catch((error) => {
-            commit('catchError', error);
-         });
-      },
-   }
-});
-
-export { store };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/api.js
index e54bd9b15..7a91ec912 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/api.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/api.js
@@ -37,7 +37,20 @@ const fetchHouseholdSuggestionByAccompanyingPeriod = (personId) => {
   ;
 };
 
+const fetchAddressSuggestionByPerson = (personId) => {
+  const url = `/api/1.0/person/address/suggest/by-person/${personId}.json`;
+  return window.fetch(url)
+    .then(response => {
+      if (response.ok) {
+        return response.json();
+      }
+
+      throw Error({m: 'Error while fetch address suggestion', status: response.status});
+    });
+}
+
 export { 
   householdMove,
   fetchHouseholdSuggestionByAccompanyingPeriod,
+  fetchAddressSuggestionByPerson,
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 4c4929581..fa3dd64b6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -5,6 +5,38 @@
     <div>
       <household-viewer :household="household"></household-viewer>
     </div>
+    <div v-if="isHouseholdNew && !hasHouseholdAddress">
+
+      <h3>À quelle adresse habite ce ménage ?</h3>
+
+      <ul v-if="filterAddressesSuggestion.length > 0">
+        <li v-for="a in filterAddressesSuggestion">
+          <show-address :address="a"></show-address> 
+          <button class="btn" @click="setHouseholdAddress(a)">
+            Le ménage habite cette adresse
+          </button>
+        </li>
+      </ul>
+
+      <ul class="record_actions">
+        <li >
+          <button class="btn">
+            Créer une adresse
+          </button>
+        </li>
+      </ul>
+      
+    </div>
+    <div v-if="isHouseholdNew && hasHouseholdAddress">
+      <ul class="record_actions">
+        <li >
+          <button class="btn" @click="removeHouseholdAddress">
+            Supprimer cette adresse
+          </button>
+        </li>
+      </ul>
+      
+    </div>
   </div>
   <div v-else-if="isForceLeaveWithoutHousehold">
       {{ $t('household_members_editor.household.will_leave_any_household') }}
@@ -23,7 +55,7 @@
           countHouseholdSuggestion) }}
       </button>
     </li>
-    <li v-if="showHouseholdSuggestion">
+    <li v-if="showHouseholdSuggestion && hasHouseholdSuggestion">
       <button
         class="btn btn-misc"
         @click="toggleHouseholdSuggestion"
@@ -46,10 +78,15 @@
         <i class="fa fa-sign-out"></i>{{ $t('household_members_editor.household.leave_without_household') }}
       </button>
     </li>
+    <li v-if="allowRemoveHousehold">
+      <button @click="removeHousehold" class="btn">
+        {{ $t('household_members_editor.household.change') }}
+      </button>
+    </li>
   </ul>
 
   <div class="householdSuggestions">
-    <div v-if="showHouseholdSuggestion">
+    <div v-if="showHouseholdSuggestion && hasHouseholdSuggestion">
       <p>{{ $t('household_members_editor.household_for_participants_accompanying_period') }}:</p>
       <div class="householdSuggestionList">
         <div
@@ -98,11 +135,13 @@
 
 import { mapGetters, mapState } from 'vuex';
 import HouseholdViewer from 'ChillPersonAssets/vuejs/_components/Household/Household.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
 export default {
   name: 'Household',
   components: {
     HouseholdViewer,
+    ShowAddress,
   },
   computed: {
     ...mapGetters([
@@ -111,6 +150,8 @@ export default {
       'hasHouseholdSuggestion',
       'countHouseholdSuggestion',
       'filterHouseholdSuggestionByAccompanyingPeriod',
+      'filterAddressesSuggestion',
+      'hasHouseholdAddress',
     ]),
     ...mapState([
       'showHouseholdSuggestion',
@@ -119,14 +160,22 @@ export default {
       return this.$store.state.household;
     },
     allowHouseholdCreate() {
-      return this.$store.state.allowHouseholdCreate;
+      return this.$store.state.allowHouseholdCreate && !this.$store.getters.hasHousehold;
     },
     allowHouseholdSearch() {
       return false;
-      return this.$store.state.allowHouseholdSearch;
+      return this.$store.state.allowHouseholdSearch && !this.$store.getters.hasHousehold;
     },
     allowLeaveWithoutHousehold() {
-      return this.$store.state.allowLeaveWithoutHousehold;
+      return this.$store.state.allowLeaveWithoutHousehold && !this.$store.getters.hasHousehold;
+    },
+    allowRemoveHousehold() {
+      return this.$store.getters.hasHousehold &&
+        (
+          this.allowHouseholdCreate || this.allowHouseholdSearch || 
+            this.allowLeaveWithoutHousehold
+        )
+      ;
     },
     allowChangeHousehold() {
       return this.allowHouseholdCreate || this.allowHouseholdSearch || 
@@ -148,6 +197,15 @@ export default {
     },
     selectHousehold(h) {
       this.$store.dispatch('selectHousehold', h);
+    },
+    removeHousehold() {
+      this.$store.dispatch('removeHousehold');
+    },
+    setHouseholdAddress(a) {
+      this.$store.commit('setHouseholdAddress', a);
+    },
+    removeHouseholdAddress() {
+      this.$store.commit('removeHouseholdAddress');
     }
   },
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
index 15a188cf1..8c03415e9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -1,5 +1,5 @@
 import { createStore } from 'vuex';
-import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod } from './../api.js';
+import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod, fetchAddressSuggestionByPerson} from './../api.js';
 import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
 
 const debug = process.env.NODE_ENV !== 'production';
@@ -37,6 +37,7 @@ const store = createStore({
     forceLeaveWithoutHousehold: false,
     householdSuggestionByAccompanyingPeriod: [],
     showHouseholdSuggestion: window.household_members_editor_expand_suggestions === 1,
+    addressesSuggestion: [],
     warnings: [],
     errors: []
   },
@@ -47,6 +48,12 @@ const store = createStore({
       }
       return !Number.isInteger(state.household.id);
     },
+    hasHouseholdAddress(state) {
+      if (null === state.household) {
+        return false;
+      }
+      return state.household.current_address !== null;
+    },
     hasHousehold(state) {
       return state.household !== null;
     },
@@ -68,6 +75,18 @@ const store = createStore({
         .filter(h => h.id !== state.household.id)
         ;
     },
+    filterAddressesSuggestion(state) {
+      if (state.household === null) {
+        return state.addressesSuggestion;
+      }
+
+      if (state.household.current_address === null) {
+        return state.addressesSuggestion;
+      }
+
+      return state.addressesSuggestion
+        .filter(a => a.address_id !== state.household.current_address.address_id);
+    },
     hasPersonsWellPositionnated(state, getters) {
       return getters.needsPositionning === false
         || (getters.persons.length > 0 && getters.concUnpositionned.length === 0);
@@ -106,7 +125,7 @@ const store = createStore({
     needsPositionning(state) {
       return state.forceLeaveWithoutHousehold === false;
     },
-    buildPayload: (state) => {
+    buildPayload: (state, getters) => {
       let
         conc,
         payload_conc,
@@ -119,8 +138,13 @@ const store = createStore({
       if (state.forceLeaveWithoutHousehold === false) {
         payload.destination = {
             id: state.household.id,
-            type: state.household.type
+            type: state.household.type,
           };
+
+        if (getters.isHouseholdNew && state.household.current_address !== null) {
+          console.log(state.household);
+          payload.destination.forceAddress = { id: state.household.current_address.address_id };
+        }
       }
 
       for (let i in state.concerned) {
@@ -187,9 +211,29 @@ const store = createStore({
       )
     },
     createHousehold(state) {
-      state.household = { type: 'household', members: [], current_address: null }
+      state.household = { type: 'household', members: [], current_address: null, current_members_id: [] }
       state.forceLeaveWithoutHousehold = false;
     },
+    removeHousehold(state) {
+      state.household = null;
+      state.forceLeaveWithoutHousehold = false;
+    },
+    setHouseholdAddress(state, address) {
+      if (null === state.household) {
+        console.error("no household");
+        throw new Error("No household");
+      }
+
+      state.household.current_address = address;
+    },
+    removeHouseholdAddress(state, address) {
+      if (null === state.household) {
+        console.error("no household");
+        throw new Error("No household");
+      }
+
+      state.household.current_address = null;
+    },
     forceLeaveWithoutHousehold(state) {
       state.household = null;
       state.forceLeaveWithoutHousehold = true;
@@ -221,11 +265,22 @@ const store = createStore({
     setErrors(state, errors) {
       state.errors = errors;
     },
+    addAddressesSuggestion(state, addresses) {
+      let existingIds = state.addressesSuggestion
+        .map(a => a.address_id);
+
+      for (let i in addresses) {
+        if (!existingIds.includes(addresses[i].address_id)) {
+          state.addressesSuggestion.push(addresses[i]);
+        }
+      }
+    }
   },
   actions: {
     addConcerned({ commit, dispatch }, person) {
       commit('addConcerned', person);
       dispatch('computeWarnings');
+      dispatch('fetchAddressSuggestions');
     },
     markPosition({ commit, state, dispatch }, { person_id, position_id }) {
       commit('markPosition', { person_id, position_id });
@@ -242,6 +297,11 @@ const store = createStore({
     removeConcerned({ commit, dispatch }, conc) {
       commit('removeConcerned', conc);
       dispatch('computeWarnings');
+      dispatch('fetchAddressSuggestions');
+    },
+    removeHousehold({ commit, dispatch }) {
+      commit('removeHousehold');
+      dispatch('computeWarnings');
     },
     createHousehold({ commit, dispatch }) {
       commit('createHousehold');
@@ -268,6 +328,17 @@ const store = createStore({
           commit('setHouseholdSuggestionByAccompanyingPeriod', households);
         });
     },
+    fetchAddressSuggestions({ commit, state }) {
+      for (let i in state.concerned) {
+        fetchAddressSuggestionByPerson(state.concerned[i].person.id)
+          .then(addresses => {
+            commit('addAddressesSuggestion', addresses);
+          })
+          .catch(e => {
+            console.log(e);
+          });
+      }
+    },
     computeWarnings({ commit, state, getters }) {
       let warnings = [],
         payload;
@@ -321,6 +392,7 @@ const store = createStore({
 });
 
 store.dispatch('computeWarnings');
+store.dispatch('fetchAddressSuggestions');
 
 if (concerned.length > 0) {
   concerned.forEach(c => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddAddress.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddAddress.js
new file mode 100644
index 000000000..3b8c35e79
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddAddress.js
@@ -0,0 +1,51 @@
+
+/*
+* Endpoint chill_api_single_person_address
+* method POST, post Person instance
+*
+*  @id     integer - id of Person
+*  @body   Object - dictionary with changes to post
+*/
+const postAddressToPerson = (personId, addressId) => {
+    //console.log(personId);
+    //console.log(addressId);
+    const body = {
+        'id': addressId
+    };
+    const url = `/api/1.0/person/person/${personId}/address.json`
+    return fetch(url, {
+        method: 'POST',
+        headers: {'Content-Type': 'application/json;charset=utf-8'},
+        body: JSON.stringify(body)
+    })
+        .then(response => {
+            if (response.ok) { return response.json(); }
+            throw Error('Error with request resource response');
+        });
+};
+
+/*
+* Endpoint household
+* method POST, post Household instance
+*
+*  @id     integer - id of household
+*  @body   Object - dictionary with changes to post
+*/
+const postAddressToHousehold = (householdId, addressId) => {
+    const body = {
+        'id': addressId
+    };
+    const url = `/api/1.0/person/household/${householdId}/address.json`
+    return fetch(url, {
+        method: 'POST',
+        headers: {'Content-Type': 'application/json;charset=utf-8'},
+        body: JSON.stringify(body)
+    })
+        .then(response => {
+            if (response.ok) { return response.json(); }
+            throw Error('Error with request resource response');
+        });
+};
+
+
+export { postAddressToPerson, postAddressToHousehold };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 27d6b48a8..b6ce8a897 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -1,13 +1,13 @@
 <template>
 <div v-if="action === 'show'">
-   
+
    <div class="flex-table">
       <div class="item-bloc">
          <div class="item-row">
             <div class="item-col">
                <h3 :title="person.id">{{ person.text }}</h3>
                <p>
-                  <i class="fa fa-fw" 
+                  <i class="fa fa-fw"
                      :class="genderClass">
                      <!--
                      :title="$t(genderTranslation)"
@@ -20,27 +20,27 @@
                </p>
             </div>
             <div class="item-col">
-               <dl class="list-content"> 
+               <dl class="list-content">
                   <dt>{{ $t('person.firstname') }}</dt>
                   <dd>{{ person.firstName }}</dd>
-                  
+
                   <dt>{{ $t('person.lastname') }}</dt>
                   <dd>{{ person.lastName }}</dd>
-                  
+
                   <dt>{{ $t('person.altnames') }}</dt>
                   <dd>{{ person.altNames }}</dd>
-                  
+
                   <span v-if="person.center">
                      <dt>{{ $t('person.center_name') }}</dt>
                      <dd :title="person.center.id">{{ person.center.name }}</dd>
                   </span>
-                     
+
                   <dt>{{ $t('person.phonenumber') }}</dt>
                   <dd>{{ person.phonenumber }}</dd>
-                  
+
                   <dt>{{ $t('person.mobilenumber') }}</dt>
                   <dd>{{ person.mobilenumber }}</dd>
-                  
+
                   <dt>{{ $t('person.gender.title') }}</dt>
                   <!--
                   <dd>{{ $t(genderTranslation) }}</dd>
@@ -49,61 +49,61 @@
             </div>
          </div>
       </div>
-   </div>   
-   
+   </div>
+
 </div>
 <div v-else-if="action === 'edit' || action === 'create'">
-   
+
    <div class="form-floating mb-3">
       <input class="form-control form-control-lg" id="firstname" v-model="firstName" v-bind:placeholder="$t('person.firstname')" />
       <label for="firstname">{{ $t('person.firstname') }}</label>
    </div>
-   
+
    <div class="form-floating mb-3">
       <input class="form-control form-control-lg" id="lastname" v-model="lastName" v-bind:placeholder="$t('person.lastname')" />
       <label for="lastname">{{ $t('person.lastname') }}</label>
    </div>
-   
-   <!--  TODO fix placeholder if undefined 
+
+   <!--  TODO fix placeholder if undefined
    -->
    <div class="form-floating mb-3">
       <select class="form-select form-select-lg" id="gender" v-model="gender">
-         <option selected disabled >{{ $t('person.gender.placeholder') }}</option> 
+         <option selected disabled >{{ $t('person.gender.placeholder') }}</option>
          <option value="woman">{{ $t('person.gender.woman') }}</option>
          <option value="man">{{ $t('person.gender.man') }}</option>
-         <option value="neuter">{{ $t('person.gender.neuter') }}</option>  
+         <option value="neuter">{{ $t('person.gender.neuter') }}</option>
       </select>
       <label for="gender">{{ $t('person.gender.title') }}</label>
    </div>
-   
+
    <div class="input-group mb-3">
       <span class="input-group-text" id="birthdate"><i class="fa fa-fw fa-birthday-cake"></i></span>
-      <input type="date" 
-         class="form-control form-control-lg" 
-         id="chill_personbundle_person_birthdate" 
-         name="chill_personbundle_person[birthdate]" 
+      <input type="date"
+         class="form-control form-control-lg"
+         id="chill_personbundle_person_birthdate"
+         name="chill_personbundle_person[birthdate]"
          v-model="birthDate"
          aria-describedby="birthdate" />
    </div>
-   
+
    <div class="input-group mb-3">
       <span class="input-group-text" id="phonenumber"><i class="fa fa-fw fa-phone"></i></span>
-      <input class="form-control form-control-lg" 
-         v-model="phonenumber" 
-         v-bind:placeholder="$t('person.phonenumber')" 
-         v-bind:aria-label="$t('person.phonenumber')" 
+      <input class="form-control form-control-lg"
+         v-model="phonenumber"
+         v-bind:placeholder="$t('person.phonenumber')"
+         v-bind:aria-label="$t('person.phonenumber')"
          aria-describedby="phonenumber" />
    </div>
-   
+
    <div class="input-group mb-3">
       <span class="input-group-text" id="mobilenumber"><i class="fa fa-fw fa-mobile"></i></span>
-      <input class="form-control form-control-lg" 
-         v-model="mobilenumber" 
+      <input class="form-control form-control-lg"
+         v-model="mobilenumber"
          v-bind:placeholder="$t('person.mobilenumber')"
-         v-bind:aria-label="$t('person.mobilenumber')" 
+         v-bind:aria-label="$t('person.mobilenumber')"
          aria-describedby="mobilenumber" />
    </div>
-   
+
 </div>
 </template>
 
@@ -131,19 +131,19 @@ export default {
       },
       gender: {
          set(value) { this.person.gender = value; },
-         get() { return this.person.gender; } 
+         get() { return this.person.gender; }
       },
       birthDate: {
-         set(value) { 
+         set(value) {
             if (this.person.birthdate) {
-               this.person.birthdate.datetime = value + "T00:00:00+0100"; 
+               this.person.birthdate.datetime = value + "T00:00:00+0100";
             } else {
                this.person.birthdate = { datetime: value + "T00:00:00+0100"};
             }
          },
-         get() { 
-            return (this.person.birthdate) ? this.person.birthdate.datetime.split('T')[0] : ''; 
-         } 
+         get() {
+            return (this.person.birthdate) ? this.person.birthdate.datetime.split('T')[0] : '';
+         }
       },
       phonenumber: {
          set(value) { this.person.phonenumber = value; },
@@ -174,7 +174,7 @@ export default {
          }
       },
       feminized() {
-         return (this.person.gender === 'woman')? 'e' : ''; 
+         return (this.person.gender === 'woman')? 'e' : '';
       }
    },
    mounted() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig
new file mode 100644
index 000000000..d56ed6442
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig
@@ -0,0 +1,5 @@
+<div class="alert alert-danger alert-with-actions mb-0">
+    <div class="message">
+        {{ 'This course is located at a temporarily address. You should locate this course to an user'|trans }}
+    </div>
+</div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 356f7fd32..4310e46ed 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -19,7 +19,7 @@
 <div class="accompanyingcourse-resume">
 
     {% if 'DRAFT' == accompanyingCourse.step %}
-        <div class="col-8 alert alert-danger flash_message mb-5">
+        <div class="alert alert-danger flash_message mb-5">
             <span>
                 {{ 'This accompanying course is still a draft'|trans }}
                 <a href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id } ) }}">
@@ -50,8 +50,13 @@
                 {% endif %}
             {% endfor %}
         </div>
-        {% if withoutHousehold|length > 0 %}
-            {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' with {} %}
+        {% if 'DRAFT' != accompanyingCourse.step %}
+            {% if withoutHousehold|length > 0 %}
+                {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' with {} %}
+            {% endif %}
+            {% if accompanyingCourse.locationStatus == 'address' or accompanyingCourse.locationStatus == 'none' %}
+                {% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' with {} %}
+            {% endif %}
         {% endif %}
     </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
index 4dc7a90aa..e1f82bb64 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
@@ -2,7 +2,7 @@
 
 {% set activeRouteKey = 'chill_person_accompanying_period_list' %}
 
-{% block title %}{{ 'Person accompanying period - %name%'|trans({ '%name%' : person.__toString}) }}{% endblock title %}
+{% block title %}{{ 'Accompanying period list'|trans }}{% endblock title %}
 
 {% block personcontent %}
 <div class="accompanyingcourse-list">
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
new file mode 100644
index 000000000..8038257d6
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -0,0 +1,72 @@
+{#
+    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'
+
+#}
+<div id="address"></div>
+
+<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 %}
+
+    {% 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 %}
+        {% 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 %}
+        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') }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
index 5f5a4a888..50bc14171 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
@@ -18,29 +18,21 @@
 
 {% set activeRouteKey = '' %}
 
-{% block title 'Modify address for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) %}
+{% block title 'Edit an address'|trans %}
 
 {% block personcontent %}
-<div class="address-new">
-            
-            {% block content %}
-                <h1>{{ block('title') }}</h1>
-                <div id="address"></div>
-            {% endblock %}
+<div class="address-edit">
+
+    {% block content %}
+        <h1>{{ block('title') }}</h1>
+
+        {# include vue_address component #}
+        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+            binModalStep1: false,
+            binModalStep2: false,
+        } %}
+
+    {% endblock %}
 
 </div>
 {% endblock %}
-
-{% block css %}
-    {{ encore_entry_link_tags('vue_address') }}
-{% endblock %}
-
-{% block js %}
-    <script type="text/javascript">
-        window.personId = {{ person.id|e('js') }};
-        window.addressId = {{ address.id|e('js') }};
-        window.mode = 'edit';
-        window.vueRootComponent = 'app';
-    </script>
-    {{ encore_entry_script_tags('vue_address') }}
-{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
index 60de27e37..db136592f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
@@ -27,10 +27,15 @@
 
     <ul class="record_actions my-3">
         <li style="margin: auto;">
-            <a class="btn btn-lg btn-create"
-               href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}">
-                {{ 'Add an address'|trans }}
-            </a>
+
+            {# include vue_address component #}
+            {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+                mode: 'new',
+                buttonSize: 'btn-lg',
+                buttonText: 'Add an address',
+                modalTitle: 'Add an address',
+            } %}
+
         </li>
     </ul>
 
@@ -58,10 +63,32 @@
             {% set row = row + 1 %}
             {% 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 '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+                            address_id: address.id,
+                            mode: 'edit',
+                            binModalStep1: false,
+                            binModalStep2: false,
+                        } %}
+                    #}
+
                 <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 '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+                            address_id: address.id,
+                            mode: 'edit',
+                            binModalStep1: false,
+                            binModalStep2: false,
+                        } %}
+                    #}
+
                 <div class="date">
                     {% if address.validTo is not empty %}
                         {{ address.validTo|format_date('short') }}
@@ -81,7 +108,10 @@
                         'has_no_address': true
                     }) }}
                     <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>
                 </div>
             {# endif #}
@@ -130,6 +160,7 @@
             </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/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index 2365c2d03..3abd650f5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -18,28 +18,22 @@
 
 {% set activeRouteKey = '' %}
 
-{% block title %}{{ 'New address for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}{% endblock %}
+{% block title %}{{ 'New address'|trans }}{% endblock %}
 
 {% block personcontent %}
 <div class="address-new">
 
-            {% block content %}
-                <h1>{{ block('title') }}</h1>
-                <div id="address"></div>
-            {% endblock %}
-            
+    {% block content %}
+        <h1>{{ block('title') }}</h1>
+
+        {# include vue_address component #}
+        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+            binModalStep1: false,
+            binModalStep2: false,
+        } %}
+
+    {% endblock %}
+
 </div>
 {% endblock %}
 
-{% block css %}
-    {{ encore_entry_link_tags('vue_address') }}
-{% endblock %}
-
-{% block js %}
-    <script type="text/javascript">
-        window.personId = {{ person.id|e('js') }};
-        window.mode = 'new';
-        window.vueRootComponent = 'app';
-    </script>
-    {{ encore_entry_script_tags('vue_address') }}
-{% endblock %}
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 935eb70fa..446cd769b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -6,21 +6,11 @@
     <h1>{{ block('title') }}</h1>
 
     <div>
-        <div id="household-address"></div>
+        {# include vue_address component #}
+        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+            binModalStep1: false,
+            binModalStep2: false,
+        } %}
     </div>
 
-    {% block stylesheets %}
-        {{ encore_entry_link_tags('vue_address') }}
-    {% endblock %}
-
-    {% block js %}
-       <script type="text/javascript">
-            window.householdId = {{ household.id|e('js') }};
-            window.addressId = {{ address.id|e('js') }};
-            window.mode = 'edit';
-            window.vueRootComponent = 'app';
-        </script>
-        {{ encore_entry_script_tags('vue_household_address') }}
-    {% endblock %}
-
 {% endblock %}
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 095ae26ff..b2da2097a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -6,19 +6,11 @@
     <h1>{{ block('title') }}</h1>
 
     <div>
-        <div id="household-address"></div>
+        {# include vue_address component #}
+        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+            binModalStep1: false,
+            binModalStep2: false,
+        } %}
     </div>
 
-    {% block stylesheets %}
-        {{ encore_entry_link_tags('vue_address') }}
-    {% endblock %}
-
-    {% block js %}
-       <script type="text/javascript">
-            window.householdId = {{ household.id|e('js') }};
-            window.vueRootComponent = 'app';
-        </script>
-        {{ encore_entry_script_tags('vue_household_address') }}
-    {% endblock %}
-
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
index 0938a642b..2acd68731 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
@@ -13,10 +13,16 @@
 
         <ul class="record_actions my-3">
             <li style="margin: auto;">
-                <a class="btn btn-lg btn-create"
-                   href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
-                    {{ 'Move household'|trans }}
-                </a>
+
+                {# 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 }),
+                    buttonSize: 'btn-lg',
+                    buttonText: 'Move household',
+                    modalTitle: 'Move household',
+                } %}
+
             </li>
         </ul>
 
@@ -34,7 +40,10 @@
 
                 <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">
                     {% if address.validTo is not empty %}
                         {{ address.validTo|format_date('short') }}
@@ -54,7 +63,11 @@
                 }) }}
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}" class="btn btn-edit"></a>
+
+                        {# 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>
+
                     </li>
                 </ul>
             </div>
@@ -77,10 +90,13 @@
             </a>
         </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 }}
+                href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
+                {{ 'Move household'|trans }}
             </a>
+
         </li>
     </ul>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
index db81ec320..976e29a54 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@@ -200,10 +200,15 @@ This view should receive those arguments:
 
                         <ul class="list-inline text-right mt-2">
                             <li class="list-inline-item">
-                                <a class="btn btn-warning btn-sm" title="{{ 'Edit'|trans }}"
-                                   href="{{ path('chill_person_address_edit', { 'person_id': person.id, 'address_id' : person.lastAddress.id } ) }}">
-                                    <i class="fa fa-pencil fa-fw"></i>
-                                </a>
+                                {# include vue_address component #}
+                                {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+                                    mode: 'edit',
+                                    address_id: person.lastAddress.id,
+                                    backUrl: path('chill_person_view', { 'person_id': person.id }),
+                                    modalTitle: 'Edit address', buttonText: 'Edit address',
+                                    buttonSize: 'btn-sm',
+                                    buttonDisplayText: false
+                                } %}
                             </li>
                             <li class="list-inline-item">
                                 <a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
index 57745e276..b2c21c048 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
@@ -77,8 +77,11 @@ class MembersEditorNormalizer implements DenormalizerInterface, DenormalizerAwar
 
     protected function denormalizeMove($data, string $type, string $format, array $context = [])
     {
+        $householdContext = $context;
+        $householdContext['groups'][] = 'create';
+
         $household = $this->denormalizer->denormalize($data['destination'], Household::class, 
-            $format, $context);
+            $format, $householdContext);
 
         if (NULL === $household) {
            throw new Exception\InvalidArgumentException("household could not be denormalized. Impossible to process"); 
diff --git a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
index a9fc9f1cd..1b2c9cd85 100644
--- a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
@@ -1169,14 +1169,32 @@ paths:
                         id: 0
                         type: person
                       position:
-                        type: position
+                        type: household_position
                         id: 1
                       start_date:
-                        datetime: 2021-06-01T00:00:00+02:00
+                        datetime: "2021-06-01T00:00:00+02:00"
                       comment: "This is my comment for moving"
                       holder: false
                   destination:
                     type: household
+              Moving person to a new household and set an address to this household:
+                value:
+                  concerned:
+                    -
+                      person:
+                        id: 0
+                        type: person
+                      position:
+                        type: household_position
+                        id: 1
+                      start_date:
+                        datetime: "2021-06-01T00:00:00+02:00"
+                      comment: "This is my comment for moving"
+                      holder: false
+                  destination:
+                    type: household
+                    forceAddress:
+                      id: 0
               Moving person to an existing household:
                 value:
                   concerned:
@@ -1185,7 +1203,7 @@ paths:
                         id: 0
                         type: person
                       position:
-                        type: position
+                        type: household_position
                         id: 1
                       start_date:
                         datetime: 2021-06-01T00:00:00+02:00
diff --git a/src/Bundle/ChillPersonBundle/chill.webpack.config.js b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
index ebfdef01d..7d60e86a3 100644
--- a/src/Bundle/ChillPersonBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
@@ -8,7 +8,7 @@ module.exports = function(encore, entries)
         ChillPersonAssets: __dirname + '/Resources/public'
     });
 
-    encore.addEntry('vue_household_address', __dirname + '/Resources/public/vuejs/HouseholdAddress/index.js');
+
     encore.addEntry('vue_household_members_editor', __dirname + '/Resources/public/vuejs/HouseholdMembersEditor/index.js');
     encore.addEntry('vue_accourse', __dirname + '/Resources/public/vuejs/AccompanyingCourse/index.js');
     encore.addEntry('vue_accourse_work_create', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkCreate/index.js');
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index e6fe6e56c..4cf171f2b 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -207,8 +207,11 @@ No address given: Pas d'adresse renseignée
 The address has been successfully updated: L'adresse a été mise à jour avec succès
 Update address for %name%: Mettre à jour une adresse pour %name%
 Modify address for %name%: Modifier une adresse pour %name%
+Edit an address: Modifier une adresse
+Edit address: Modifier l'adresse
 Addresses history for %name%: Historique des adresses de %name%
 Addresses history: Historique des adresses
+New address : Nouvelle adresse
 New address for %name% : Nouvelle adresse pour %name%
 The new address was created successfully: La nouvelle adresse a été créée
 Add an address: Ajouter une adresse
diff --git a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
index 1c526aa1e..bc76dacd4 100644
--- a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
@@ -547,7 +547,7 @@ class SingleTaskController extends AbstractController
         $viewParams['tasks_count'] = $tasks_count;
 
         if ($viewParams['person'] !== null){
-            $viewParams['layout'] = 'ChillPersonBundle::layout.html.twig';
+            $viewParams['layout'] = '@ChillPerson/Person/layout.html.twig';
         } else {
             $viewParams['layout'] = '@ChillMain/layout.html.twig';
         }
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
index 149a5401c..2a33fc10c 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends layout %}
+{% extends '@ChillPerson/Person/layout.html.twig' %}
 
 {% set activeRouteKey = 'chill_task_single_task_new' %}