diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
index 4bef3ba27..c5ee23cec 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
@@ -1,6 +1,6 @@
 import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
 
-const appMessages = {
+const activityMessages = {
    fr: {
       activity: {
          //
@@ -36,8 +36,8 @@ const appMessages = {
    }
 }
 
-Object.assign(appMessages.fr, personMessages.fr);
+Object.assign(activityMessages.fr, personMessages.fr);
 
 export {
-   appMessages
+   activityMessages
 };
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
index bd850419e..1408afd37 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
@@ -1,11 +1,11 @@
 import { createApp } from 'vue';
 import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
-import { appMessages } from './i18n'
+import { activityMessages } from './i18n'
 import store from './store'
 
 import App from './App.vue';
 
-const i18n = _createI18n(appMessages);
+const i18n = _createI18n(activityMessages);
 
 const app = createApp({
    template: `<app></app>`,
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
index 5999fdbd0..2741f8b8f 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
@@ -1,9 +1,10 @@
 <template>
   <concerned-groups></concerned-groups>
+  <location></location>
   <teleport to="#calendarControls">
-    <calendar-user-selector 
+    <calendar-user-selector
       v-bind:users="users"
-      v-bind:calendarEvents="calendarEvents" 
+      v-bind:calendarEvents="calendarEvents"
       v-bind:updateEventsSource="updateEventsSource"
       v-bind:showMyCalendar="showMyCalendar"
       v-bind:toggleMyCalendar="toggleMyCalendar"
@@ -22,6 +23,7 @@
 
 <script>
 import ConcernedGroups from 'ChillActivityAssets/vuejs/Activity/components/ConcernedGroups.vue';
+import Location from 'ChillActivityAssets/vuejs/Activity/components/Location.vue';
 import CalendarUserSelector from '../_components/CalendarUserSelector/CalendarUserSelector.vue';
 import '@fullcalendar/core/vdom'; // solves problem with Vite
 import frLocale from '@fullcalendar/core/locales/fr';
@@ -35,6 +37,7 @@ export default {
   name: "App",
   components: {
     ConcernedGroups,
+    Location,
     CalendarUserSelector,
     FullCalendar
   },
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/i18n.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/i18n.js
index c086fed07..3020502e9 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/i18n.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/i18n.js
@@ -1,5 +1,6 @@
 import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
 import { calendarUserSelectorMessages } from '../_components/CalendarUserSelector/js/i18n';
+import { activityMessages } from 'ChillActivityAssets/vuejs/Activity/i18n';
 
 const appMessages = {
    fr: {
@@ -17,6 +18,7 @@ const appMessages = {
 
 Object.assign(appMessages.fr, personMessages.fr);
 Object.assign(appMessages.fr, calendarUserSelectorMessages.fr);
+Object.assign(appMessages.fr, activityMessages.fr);
 
 export {
    appMessages
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js
index 03d0548dc..b4578ea2b 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js
@@ -66,6 +66,11 @@ const store = createStore({
       setEvents(state, payload) {
          console.log(payload)
          state.currentEvent = {start: payload.start, end: payload.end}
+      },
+      // Location
+      updateLocation(state, value) {
+         console.log('### mutation: updateLocation', value);
+         state.activity.location = value;
       }
    },
    actions: {
@@ -130,6 +135,14 @@ const store = createStore({
          commit('setEvents', payload);
       },
 
+      // Location
+      updateLocation({ commit }, value) {
+         console.log('### action: updateLocation', value);
+         let hiddenLocation = document.getElementById("chill_calendarbundle_calendar_location");
+         hiddenLocation.value = value.id;
+         commit('updateLocation', value);
+      }
+
   }
 });
 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
index e8830a33d..5dfde6fc3 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
@@ -36,6 +36,20 @@
     <dt class="inline">{{ 'status'|trans }}</dt>
     <dd>{{ entity.status }}</dd>
 
+
+    <dt class="inline">{{ 'calendar location'|trans }}</dt>
+    <dd>
+        {% if entity.location is not null %}
+            <p>
+                <span>{{ entity.location.locationType.title|localize_translatable_string }}</span>
+                {{ entity.location.name }}
+            </p>
+            {{ entity.location.address|chill_entity_render_box }}
+        {% else %}
+            <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
+        {% endif %}
+    </dd>
+
     {% if not entity.comment.isEmpty %}
     <dt class="inline">{{ 'calendar comment'|trans }}</dt>
     <dd>{{ entity.comment|chill_entity_render_box }}</dd>
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index 562233546..56ac8543c 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -14,6 +14,7 @@ start date: début du rendez-vous
 end date: fin du rendez-vous
 cancel reason: motif d'annulation
 status: Statut du rendez-vous
+calendar location: Localistion du rendez-vous
 calendar comment: Remarque sur le rendez-vous
 sendSMS: Envoi d'un SMS
 Send s m s: Envoi d'un SMS ?