diff --git a/internal-api/dao/calendar_dao.php b/internal-api/dao/calendar_dao.php
index c7a44c95..1a02b442 100644
--- a/internal-api/dao/calendar_dao.php
+++ b/internal-api/dao/calendar_dao.php
@@ -27,12 +27,13 @@ function get_events($start, $end, $hesk_settings) {
 /**
  * @param $event. All times must be in milliseconds since epoch time.
  * @param $hesk_settings
+ * @return int the event id
  */
 function create_event($event, $hesk_settings) {
 
-    $event['start'] = date('Y-m-d H:i:s', $event['start']);
-    $event['end'] = date('Y-m-d H:i:s', $event['end']);
-    $event['create_ticket_date'] = date('Y-m-d H:i:s', $event['create_ticket_date']);
+    $event['start'] = date('Y-m-d H:i:s', strtotime($event['start']));
+    $event['end'] = date('Y-m-d H:i:s', strtotime($event['end']));
+    $event['create_ticket_date'] = date('Y-m-d H:i:s', strtotime($event['create_ticket_date']));
     $event['all_day'] = $event['all_day'] ? 1 : 0;
     $event['assign_to'] = $event['assign_to'] != null ? intval($event['assign_to']) : 'NULL';
 
diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js
index fc5127cf..10d1aea8 100644
--- a/js/calendar/mods-for-hesk-calendar.js
+++ b/js/calendar/mods-for-hesk-calendar.js
@@ -47,9 +47,9 @@ $(document).ready(function() {
         }
 
         if ($('#create-form input[name="create-ticket-date"]').val() != '') {
-            createTicketDate = moment($('#create-form input[name="create-ticket-date"]')).format('YYYY-MM-DD');
+            createTicketDate = moment($('#create-form input[name="create-ticket-date"]').val()).format('YYYY-MM-DD');
         }
-        if (allDay) {
+        if (!allDay) {
             start += ' ' + $('#create-form input[name="start-time"]').val();
             end += ' ' + $('#create-form input[name="end-time"]').val();
             dateFormat = 'YYYY-MM-DD HH:mm:ss';
@@ -61,12 +61,14 @@ $(document).ready(function() {
             startTime: moment(start).format(dateFormat),
             endTime: moment(end).format(dateFormat),
             allDay: allDay,
-            comments: $('#create-form input[name="comments"]').val(),
+            comments: $('#create-form textarea[name="comments"]').val(),
             createTicketDate: createTicketDate,
             assignTo: assignTo,
             action: 'create'
         };
 
+        console.log(data);
+
         $.ajax({
             method: 'POST',
             url: getHelpdeskUrl() + '/internal-api/admin/calendar',
@@ -77,7 +79,7 @@ $(document).ready(function() {
             failure: function(data) {
                 console.log(data);
             }
-        })
+        });
     });
 });