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 51b86fefa..a8c832d1d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -94,8 +94,18 @@
       </template>
       <template v-else>
         <household-render-box :household="household" :isAddressMultiline="true"></household-render-box>
+        <ul v-if="!hasHouseholhdAddress" class="record_actions">
+          <li>
+            <add-address
+              :context="getAddressContext"
+              :key="addAddress.key"
+              :options="addAddress.options"
+              :addressChangedCallback="addressChanged"
+              ></add-address>
+          </li>
+        </ul>
       </template>
-    </div>
+      </div>
 
     <ul v-if="isModeNewAllowed || isModeLeaveAllowed || getModeSuggestions.length > 0" class="record_actions">
       <li>
@@ -124,6 +134,7 @@ export default {
   data() {
     return {
       addAddress: {
+        /*
         context: {
           target: {
             name: 'household_create',
@@ -132,14 +143,17 @@ export default {
           edit: false,
           addressId: null
         },
+
+         */
         key: 'household_new',
         options: {
           useDate: {
-             validFrom: true
+             validFrom: false,
+             validTo: false,
           },
           button: {
             text:  {
-              create: 'household_members_editor.household.or_create_new_address',
+              create: 'household_members_editor.household.set_address',
               edit: null,
             }
           },
@@ -165,7 +179,8 @@ export default {
       'countAddressSuggestion',
       'filterAddressesSuggestion',
       'hasHouseholdAddress',
-      'isModeLeave'
+      'isModeLeave',
+      'getAddressContext',
     ]),
     ...mapState([
       'showHouseholdSuggestion',
@@ -190,18 +205,14 @@ export default {
     resetMode() {
       this.$store.commit('resetMode');
     },
-    toggleHouseholdSuggestion() {
-      this.$store.commit('toggleHouseholdSuggestion');
-    },
-    toggleAddressSuggestion() {
-      this.$store.commit('toggleAddressSuggestion');
+    addressChanged(payload) {
+      console.log("addressChanged", payload);
     },
     selectHousehold(h) {
       this.$store.dispatch('selectHousehold', h);
     },
-    removeHousehold() {
-      this.$store.dispatch('removeHousehold');
-    },
+
+
     setHouseholdAddress(a) {
       let payload = this.$refs.addAddress.submitNewAddress();
       console.log('setHouseholdAddress', a);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index da147ab75..40201af77 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -13,13 +13,16 @@ const appMessages = {
         leave: "Quitter",
         will_leave_any_household_explanation: "Les usagers quitteront leur ménage actuel, et ne seront pas associés à un autre ménage. Par ailleurs, ils seront enregistrés comme étant sans adresse connue.",
         leave_without_household: "Sans nouveau ménage",
+        set_address: "Indiquer une adresse",
+        reset_mode: "Modifier la destination",
+        // remove ?
         where_live_the_household: "À quelle adresse habite ce ménage ?",
         household_live_to_this_address: "Sélectionner l'adresse",
         no_suggestions: "Aucune adresse à suggérer",
         delete_this_address: "Supprimer cette adresse",
         create_new_address: "Créer une nouvelle adresse",
         or_create_new_address: "Ou créer une nouvelle adresse",
-        reset_mode: "Modifier la destination",
+        // end remove ?
       },
       concerned: {
         title: "Nouveaux membres du ménage",
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 2cfe0055b..a32a432bf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -93,6 +93,11 @@ const store = createStore({
 
      */
     },
+    getAddressContext(state) {
+      return {
+        edit: false,
+      };
+    },
     hasHouseholdAddress(state) {
       if (null === state.household) {
         return false;