diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
index 3a7841cd9..69913323c 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
@@ -74,7 +74,6 @@ export default {
                                         ...concernedThirdPartiesLocation,
                                         ...response.results,
                                     ];
-                                    console.log(this.locations);
                                     if (window.default_location_id) {
                                         let location = this.locations.filter(
                                             (l) => l.id === window.default_location_id
@@ -102,7 +101,6 @@ export default {
         },
         makeConcernedPersonsLocation(locationType) {
             let locations = [];
-            console.log(this.suggestedEntities)
             this.suggestedEntities.forEach(
                 (e) => {
                     if (e.type === 'person' && e.current_household_address !== null){
@@ -111,7 +109,7 @@ export default {
                             onthefly: true,
                             name: e.text,
                             address: {
-                                id: e.current_household_address.id,
+                                id: e.current_household_address.address_id,
                             },
                             locationType: locationType
                         });
@@ -129,7 +127,7 @@ export default {
                             type: 'location',
                             onthefly: true,
                             name: e.text,
-                            address: { id: e.address.id },
+                            address: { id: e.address.address_id },
                             locationType: locationType
                         });
                     }
@@ -138,7 +136,6 @@ export default {
             return locations;
         },
         makeAccompanyingPeriodLocation(locationType) {
-            console.log(this.activity)
             const accPeriodLocation = this.activity.accompanyingPeriod.location;
             return {
                 type: 'location',
@@ -147,7 +144,7 @@ export default {
                 address: {
                     id: accPeriodLocation.address_id,
                     text: `${accPeriodLocation.text} - ${accPeriodLocation.postcode.code} ${accPeriodLocation.postcode.name}`
-                }, //TODO is the id sufficient? 
+                },
                 locationType: locationType
             }
         }
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
index 182a3b01a..5b6297553 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
@@ -28,7 +28,6 @@ const store = createStore({
     },
     getters: {
         suggestedEntities(state) {
-            console.log(state.activity);
             if (typeof state.activity.accompanyingPeriod === "undefined") {
                 return [];
             }
@@ -304,14 +303,28 @@ const store = createStore({
             let hiddenLocation = document.getElementById(
                 "chill_activitybundle_activity_location"
             );
-            //TODO post the location if new location on-the-fly
             if (value.onthefly) {
-                postLocation(value)
+                const body = {
+                    "type": "location",
+                    "name": value.name === '__AccompanyingCourseLocation__' ? null : value.name,
+                    "locationType": {
+                        "id": value.locationType.id,
+                        "type": "location-type"
+                    }
+                };
+                if (value.address.id) {
+                    Object.assign(body, {
+                        "address": {
+                            "id": value.address.id
+                        },
+                    })
+                }
+                postLocation(body)
                     .then(
                         location => hiddenLocation.value = location.id
                     ).catch(
                         err => {
-                            this.errors.push(err.message);
+                            console.log(err.message);
                         }
                     );
             } else {