diff --git a/admin/src/app/features/calendar/components/calendar-view/calendar-view.html b/admin/src/app/features/calendar/components/calendar-view/calendar-view.html
index 63cfc8b..e3cd40e 100644
--- a/admin/src/app/features/calendar/components/calendar-view/calendar-view.html
+++ b/admin/src/app/features/calendar/components/calendar-view/calendar-view.html
@@ -8,6 +8,6 @@
 </div>
 
 <rs-daisy-modal [isOpen]="isOpen()" (closeClick)="closeDialog()"  >
- <app-create-event-form (ready)="closeDialog()"></app-create-event-form>
+ <app-create-event-form (ready)="closeDialog()" [date]="selectedDate()" [id]="selectedEventId()"></app-create-event-form>
 </rs-daisy-modal>
 
diff --git a/admin/src/app/features/calendar/components/calendar-view/calendar-view.ts b/admin/src/app/features/calendar/components/calendar-view/calendar-view.ts
index 25db3bb..e7e9ec9 100644
--- a/admin/src/app/features/calendar/components/calendar-view/calendar-view.ts
+++ b/admin/src/app/features/calendar/components/calendar-view/calendar-view.ts
@@ -65,6 +65,8 @@ export class CalendarView implements OnInit, AfterViewInit {
       dateClick: (info) => {
         console.info('setting day ',info);
         this.workflow.set('day');
+        this.selectedDate.set(info.date);
+        this.selectedEventId.set(undefined);
         this.isOpen.set(true);
         // console.info('Date click on: ' , info);
         // const calendarApi = info.view.calendar;
diff --git a/admin/src/app/features/calendar/components/create-event-form/create-event-form.ts b/admin/src/app/features/calendar/components/create-event-form/create-event-form.ts
index b37a9be..706c7bc 100644
--- a/admin/src/app/features/calendar/components/create-event-form/create-event-form.ts
+++ b/admin/src/app/features/calendar/components/create-event-form/create-event-form.ts
@@ -23,7 +23,8 @@ export class CreateEventForm implements OnInit {
   form: FormGroup;
   isEditMode = false;
   ready = output<void>();
-  id= input<number | null>() ;
+  id= input<number | undefined>() ;
+  date = input<Date|undefined>();
 
   eventTypes = signal<EventType[]>([])