diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index a0f3c58e1..3bd4f313e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -149,7 +149,7 @@ export default {
          console.log('@@@ click on Submit Temporary Address Button', payload);
          payload['locationStatusTo'] = 'address'; // <== temporary, not none, not person
          this.$store.dispatch('updateLocation', payload);
-         this.$store.commit('setEditContextTrue');
+         this.$store.commit('setEditContextTrue', payload);
       }
    },
    mounted() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 72eb57cdf..16a412fdf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -134,9 +134,10 @@ let initPromise = getAccompanyingCourse(id)
                state.accompanyingCourse.locationStatus = r.locationStatus;
                state.accompanyingCourse.personLocation = r.personLocation;
             },
-            setEditContextTrue(state) {
-              //console.log('### mutation: set edit context = true');
+            setEditContextTrue(state, payload) {
+               console.log('### mutation: set edit context true with addressId', payload.addressId);
                state.addressContext.edit = true;
+               state.addressContext.addressId = payload.addressId;
             }
          },
          actions: {
@@ -260,7 +261,7 @@ let initPromise = getAccompanyingCourse(id)
                })).catch((error) => { commit('catchError', error) });
             },
             updateLocation({ commit }, payload) {
-              //console.log('## action: updateLocation', payload.locationStatusTo);
+               console.log('## action: updateLocation', payload.locationStatusTo);
                let body = { 'type': payload.target, 'id': payload.targetId };
                let location = {};
                if (payload.locationStatusTo === 'person') { // patch for person address (don't remove addressLocation)