diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js
index 457d31799..edfb7f236 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js
@@ -1,5 +1,6 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
+import { postLocation } from 'ChillActivityAssets/vuejs/Activity/api';
 
 const debug = process.env.NODE_ENV !== 'production';
 
@@ -33,7 +34,6 @@ const store = createStore({
    },
    getters: {
       suggestedEntities(state) {
-         console.log(state.activity)
          if (typeof(state.activity.accompanyingPeriod) === 'undefined') {
            return [];
          }
@@ -189,8 +189,35 @@ const store = createStore({
       updateLocation({ commit }, value) {
          console.log('### action: updateLocation', value);
          let hiddenLocation = document.getElementById("chill_calendarbundle_calendar_location");
-         hiddenLocation.value = value.id;
-         commit('updateLocation', value);
+         if (value.onthefly) {
+             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 => {
+                         console.log(err.message);
+                     }
+                 );
+         } else {
+             hiddenLocation.value = value.id;
+         }
+         commit("updateLocation", value);
+
       }
 
   }