diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarEvent/CalendarEvent.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarEvent/CalendarEvent.vue
index 234996160..a3cf011f0 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarEvent/CalendarEvent.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarEvent/CalendarEvent.vue
@@ -22,6 +22,15 @@ export default {
       calendarOptions: {
         plugins: [ dayGridPlugin, interactionPlugin, timeGridPlugin ],
         initialView: 'dayGridMonth',
+        initialEvents: window.startDate !== undefined ?
+          [
+            {
+              id: 1,
+              start: window.startDate.date,
+              end: window.endDate.date
+            }
+          ] : [],
+        initialDate: window.startDate !== undefined ? window.startDate.date : new Date(),
         selectable: true,
         select: this.onDateSelect,
         selectMirror: true,
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
index 0f0548c47..ddb34b345 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
@@ -51,8 +51,6 @@
 
 ..calendarRange
 
-
-
 <ul class="record_actions sticky-form-buttons">
   <li class="cancel">
     <a 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editAccompanyingCourse.html.twig
index 2cb5e0b0b..91bc83b4a 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editAccompanyingCourse.html.twig
@@ -24,7 +24,9 @@
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ form.vars.form.vars.name }}"]', 
             '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
         });
-        window.entity = {{ entity_json|json_encode|raw }}; 
+        window.entity = {{ entity_json|json_encode|raw }};
+        window.startDate = {{ entity.startDate|json_encode|raw }};
+        window.endDate = {{ entity.endDate|json_encode|raw }};
     </script>
     {{ encore_entry_script_tags('vue_calendar') }}
 {% endblock %}