diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts
index d327cd48..2eb8159a 100644
--- a/src/app/core/services/poll.service.ts
+++ b/src/app/core/services/poll.service.ts
@@ -47,7 +47,7 @@ export class PollService implements Resolve<Poll> {
 	public showDateInterval = false;
 	public allowSeveralHours = false;
 	public richTextMode = false;
-	public mode_calendar = true;
+	public mode_calendar = false;
 	public calendar: Date[] = [new Date()];
 	public disabled_dates: Date[] = [];
 
diff --git a/src/app/features/administration/form/date/list/day/day-list.component.html b/src/app/features/administration/form/date/list/day/day-list.component.html
index 3d0cf378..14a4c158 100644
--- a/src/app/features/administration/form/date/list/day/day-list.component.html
+++ b/src/app/features/administration/form/date/list/day/day-list.component.html
@@ -7,9 +7,6 @@
 		(cdkDropListDropped)="dropDayItem($event)"
 	>
 		<div class="date-choice-container" *ngFor="let choice of dateChoices; index as id">
-			<p>
-				{{ choice.date_object | date: 'short' }}
-			</p>
 			<div class="date-choice" cdkDrag [ngClass]="{ 'day-weekend': isWeekendDay(choice.date_input) }">
 				<!--				<span class="button is-default">-->
 				<!--					<i class="icon fa fa-arrows-v"></i>-->
@@ -26,7 +23,8 @@
 					<span class="format-helper pull-right">{{ 'dates.format_helper' | translate }}</span>
 
 					<input
-						[(ngModel)]="choice.date_input"
+						[ngModel]="choice.date_object | date: 'yyyy-MM-dd'"
+						(ngModelChange)="convertDateInput($event, id)"
 						class="date-choice-item"
 						name="dateChoices_{{ id }}"
 						id="dateChoices_{{ id }}"
diff --git a/src/app/features/administration/form/date/list/day/day-list.component.ts b/src/app/features/administration/form/date/list/day/day-list.component.ts
index 15d26446..5d67a087 100644
--- a/src/app/features/administration/form/date/list/day/day-list.component.ts
+++ b/src/app/features/administration/form/date/list/day/day-list.component.ts
@@ -180,4 +180,16 @@ export class DayListComponent {
 	openSimple() {
 		this.display = !this.display;
 	}
+
+	/**
+	 * convert back date object to datechoices
+	 * @param date_as_string
+	 * @param choice_id
+	 */
+	convertDateInput(date_as_string: string, choice_id: number) {
+		console.log('$event,date_object', date_as_string, choice_id);
+		let newDate = new Date(date_as_string);
+		this.dateChoices[choice_id].date_object = newDate;
+		this.dateChoices[choice_id].date_input = date_as_string;
+	}
 }