diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue
index fbb5201c3..7e76dfb6b 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue
@@ -23,6 +23,7 @@
 
 import { fetchCalendarRanges } from './js/api'
 import VueMultiselect from 'vue-multiselect';
+import { whoami } from 'ChillPersonAssets/vuejs/AccompanyingCourse/api';
 
 const COLORS = ['red', 'green', 'yellow', 'blue', 'orange', 'white', 'grey'];
 
@@ -78,6 +79,13 @@ export default {
 
           console.log(calendarEvents)
           this.calendarEvents.loaded = calendarEvents;
+          whoami().then(me => new Promise((resolve, reject) => {
+            let currentUser = users.find(u => u.id === me.id);
+            this.value = currentUser;
+            this.selectUsers(currentUser);
+            resolve();
+          }));
+
 
           resolve()
       }))