diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 7c27db341..f412bb209 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -36,8 +36,8 @@ export default {
 
          let newAddress = {
             'isNoAddress': address.isNoAddress,
-            'street': address.selected.address.street,
-            'streetNumber': address.selected.address.streetNumber,
+            'street': address.street,
+            'streetNumber': address.streetNumber,
             'postcode': {'id': address.selected.city.id },
             'floor': address.floor,
             'corridor': address.corridor,
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
index ba79e88a7..92556398a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
@@ -6,8 +6,10 @@ const addressMessages = {
       select_country: 'Choisir le pays',
       select_city: 'Choisir une localité',
       select_address: 'Choisir une adresse',
-      create_address: 'Appuyer sur "Entrée" pour créer une nouvelle 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',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
index 6072cf850..1fbeae8cb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
@@ -105,6 +105,7 @@ export default {
             modalDialogClass: "modal-dialog-scrollable modal-xl"
          },
          address: {
+            writeNewAddress: false,
             loaded: {
                countries: [],
                cities: [],
@@ -120,6 +121,8 @@ export default {
                zoom: 12
             },
             isNoAddress: false,
+            street: null,
+            streetNumber: null,
             floor: null,
             corridor: null,
             steps: null,
@@ -198,6 +201,16 @@ export default {
          this.address.loaded.cities = [];
          this.address.selected.city = {};
          this.address.selected.country = {};
+         this.address.street = null;
+         this.address.streetNumber = null;
+         this.address.floor = null;
+         this.address.corridor = null;
+         this.address.steps = null;
+         this.address.flat = null;
+         this.address.buildingName = null;
+         this.address.distribution = null;
+         this.address.extra = null;
+         this.address.writeNewAddress = false;
          console.log('cities and addresses', this.address.loaded.cities, this.address.loaded.addresses);
       }
    }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
index f5da59143..dc4fef0dc 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
@@ -15,6 +15,18 @@
          :options="addresses">
       </VueMultiselect>
    </div>
+   <div v-if="writeNewAddress">
+      <input
+         type="text"
+         name="street"
+         :placeholder="$t('street')"
+         v-model="street"/>
+      <input
+         type="text"
+         name="streetNumber"
+         :placeholder="$t('streetNumber')"
+         v-model="streetNumber"/>
+   </div>
 </template>
 
 <script>
@@ -30,9 +42,28 @@ export default {
       }
    },
    computed: {
+      writeNewAddress() {
+         return this.address.writeNewAddress;
+      },
       addresses() {
          return this.address.loaded.addresses;
-      }
+      },
+      street: {
+         set(value) {
+            this.address.street = value;
+         },
+         get() {
+            return this.address.street;
+         }
+      },
+      streetNumber: {
+         set(value) {
+            this.address.streetNumber = value;
+         },
+         get() {
+            return this.address.streetNumber;
+         }
+      },
    },
    methods: {
       transName(value) {
@@ -40,14 +71,12 @@ export default {
       },
       selectAddress(value) {
          this.address.selected.address = value;
+         this.address.street = value.street;
+         this.address.streetNumber = value.streetNumber;
          this.updateMapCenter(value.point);
       },
-      addAddress (newAddress) {
-         const address = {
-            street: newAddress
-         };
-         this.value = address;
-         this.address.selected.address = address;
+      addAddress() {
+         this.address.writeNewAddress = true;
       }
    }
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
index 594f53a93..1da5d84a7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
@@ -72,8 +72,8 @@ export default {
 
          let createdAddress = {
             'isNoAddress': address.isNoAddress,
-            'street': address.selected.address.street,
-            'streetNumber': address.selected.address.streetNumber,
+            'street': address.street,
+            'streetNumber': address.streetNumber,
             'postcode': {'id': address.selected.city.id },
             'floor': address.floor,
             'corridor': address.corridor,