diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 68e1477f6..537cce4c2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -237,7 +237,7 @@ export default {
                         "comment": data.comment,
                         "telephone": data.phonenumber,
                         "email": data.email,
-                        "address": null
+                        "address": this.parent.address
                      }
                   } else {
                      type = this.$refs.castNew.radioType;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
index be97f93f4..cc5ea6551 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
@@ -27,10 +27,10 @@
             v-bind:item="item">
          </suggestion-user>
 
-        <suggestion-household
-            v-if="item.result.type === 'household'"
-            v-bind:item="item">
-        </suggestion-household>
+         <suggestion-household
+               v-if="item.result.type === 'household'"
+               v-bind:item="item">
+         </suggestion-household>
       </label>
 
    </div>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 3ae5ed653..29d6a1a20 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -248,22 +248,14 @@ export default {
       submitAddress(payload) {
          console.log('submitAddress', payload);
           if (typeof payload.addressId !== 'undefined') { // <--
-<<<<<<< HEAD
             this.context.edit = true;
             this.context.addressId = payload.addressId; // bof! use legacy and not legacy in payload
             this.thirdparty.address = payload.address;  // <--
             console.log('switch address to edit mode', this.context);
          }
-=======
-              this.context.edit = true;
-              this.context.addressId = payload.addressId; // bof! use legacy and not legacy in payload
-              this.thirdparty.address = payload.address;  // <--
-              console.log('switch address to edit mode', this.context);
-          }
       },
       addQuery(query) {
          this.thirdparty.text = query;
->>>>>>> issue422_and_others_on_AddPersons
       }
    },
    mounted() {