diff --git a/app/controllers/calendar/date.php b/app/controllers/calendar/date.php
index bd60e384ca0616b0d37b5abbfb0aabd4ac9f0d94..7eea76653ab0c415a0888b335feca6e625b9f041 100644
--- a/app/controllers/calendar/date.php
+++ b/app/controllers/calendar/date.php
@@ -230,6 +230,12 @@ class Calendar_DateController extends AuthenticatedController
             $this->date->begin = Request::get('begin');
             $this->date->end = Request::get('end');
             $this->date->repetition_end = $this->date->end;
+        } elseif (Request::submitted('begin_str') && Request::submitted('end_str')) {
+            //Assume the textual format d.m.Y H:i:
+            $begin = Request::getDateTime('begin_str', 'd.m.Y H:i');
+            $end   = Request::getDateTime('end_str', 'd.m.Y H:i');
+            $this->date->begin = $begin->getTimestamp();
+            $this->date->end   = $end->getTimestamp();
         } else {
             $time = new DateTime();
             if (Request::submitted('timestamp')) {
@@ -393,8 +399,8 @@ class Calendar_DateController extends AuthenticatedController
             }
             $this->date->editor_id = $GLOBALS['user']->id;
 
-            $begin = Request::getDateTime('begin', 'd.m.Y H:i');
-            $end = Request::getDateTime('end', 'd.m.Y H:i');
+            $begin = Request::getDateTime('begin_str', 'd.m.Y H:i');
+            $end = Request::getDateTime('end_str', 'd.m.Y H:i');
             if (Request::get('all_day') === '1') {
                 $this->all_day_event = true;
                 $begin->setTime(0,0,0);
diff --git a/app/views/calendar/date/_add_edit_form.php b/app/views/calendar/date/_add_edit_form.php
index 842464773d849dbe1247b931737b987062ee0217..bf4b5897eedadb288e4a8f7a244c55a2f3f02289 100644
--- a/app/views/calendar/date/_add_edit_form.php
+++ b/app/views/calendar/date/_add_edit_form.php
@@ -69,13 +69,13 @@
             <label class="studiprequired">
                 <?= _('Beginn') ?>
                 <span class="asterisk" title="<?= _('Dies ist ein Pflichtfeld') ?>" aria-hidden="true">*</span>
-                <input type="text" name="begin" class="begin-input" data-datetime-picker
+                <input type="text" name="begin_str" class="begin-input" data-datetime-picker
                        required="required" value="<?= date('d.m.Y H:i', $date->begin) ?>">
             </label>
             <label class="studiprequired">
                 <?= _('Ende') ?>
                 <span class="asterisk" title="<?= _('Dies ist ein Pflichtfeld') ?>" aria-hidden="true">*</span>
-                <input type="text" name="end" class="end-input" data-datetime-picker
+                <input type="text" name="end_str" class="end-input" data-datetime-picker
                        required="required" value="<?= date('d.m.Y H:i', $date->end) ?>">
             </label>
         </div>