diff --git a/admin/calendar.php b/admin/calendar.php
index 11ca37f1..1bfcf241 100644
--- a/admin/calendar.php
+++ b/admin/calendar.php
@@ -217,7 +217,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
                                         foreach ($admins as $k=>$v) {
                                             if ($k == $owner) {
-                                                echo '<option value="'.$k.'" selected="selected">'.$v.'</option>';
+                                                echo '<option value="'.$k.'" selected>'.$v.'</option>';
                                             } else {
                                                 echo '<option value="'.$k.'">'.$v.'</option>';
                                             }
@@ -237,6 +237,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                     </div>
                 </div>
                 <div class="modal-footer">
+                    <input type="hidden" name="action" value="create">
                     <div class="btn-group">
                         <button type="button" class="btn btn-default cancel-callback" data-dismiss="modal">
                             <i class="fa fa-times-circle"></i>
diff --git a/internal-api/admin/calendar/index.php b/internal-api/admin/calendar/index.php
index bab7dab2..f46a6c78 100644
--- a/internal-api/admin/calendar/index.php
+++ b/internal-api/admin/calendar/index.php
@@ -17,11 +17,31 @@ $modsForHesk_settings = mfh_getSettings();
 // Routing
 $request_method = $_SERVER['REQUEST_METHOD'];
 if ($request_method === 'GET') {
-    $start = $_GET['start'];
-    $end = $_GET['end'];
+    $start = hesk_GET('start');
+    $end = hesk_GET('end');
     $events = get_events($start, $end, $hesk_settings);
 
     return output($events);
+} elseif ($request_method === 'POST') {
+    // Create or save event
+    $action = hesk_POST('action');
+
+    if ($action === 'create') {
+        $event['title'] = hesk_POST('title');
+        $event['location'] = hesk_POST('location');
+        $event['start'] = hesk_POST('startTime');
+        $event['end'] = hesk_POST('endTime');
+        $event['all_day'] = hesk_POST('allDay');
+        $event['comments'] = hesk_POST('comments');
+        $event['create_ticket_date'] = hesk_POST('createTicketDate');
+        $event['assign_to'] = hesk_POST('assignTo');
+
+        $id = create_event($event, $hesk_settings);
+
+        return output($id);
+    } elseif ($action === 'update') {
+        //TODO
+    }
 }
 
 return http_response_code(400);
\ No newline at end of file
diff --git a/internal-api/dao/calendar_dao.php b/internal-api/dao/calendar_dao.php
index 9764d80c..c7a44c95 100644
--- a/internal-api/dao/calendar_dao.php
+++ b/internal-api/dao/calendar_dao.php
@@ -22,4 +22,26 @@ function get_events($start, $end, $hesk_settings) {
     }
 
     return $events;
-}
\ No newline at end of file
+}
+
+/**
+ * @param $event. All times must be in milliseconds since epoch time.
+ * @param $hesk_settings
+ */
+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['all_day'] = $event['all_day'] ? 1 : 0;
+    $event['assign_to'] = $event['assign_to'] != null ? intval($event['assign_to']) : 'NULL';
+
+    $sql = "INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event` (`start`, `end`, `all_day`,
+    `name`, `location`, `comments`, `create_ticket_date`, `create_ticket_assign_to`) VALUES (
+    '" . hesk_dbEscape($event['start']) . "', '" . hesk_dbEscape($event['end']) . "', '" . hesk_dbEscape($event['all_day']) . "',
+    '" . hesk_dbEscape($event['title']) . "', '" . hesk_dbEscape($event['location']) . "', '" . hesk_dbEscape($event['comments']) . "',
+    '" . hesk_dbEscape($event['create_ticket_date']) . "', " . $event['assign_to'] . ")";
+
+    hesk_dbQuery($sql);
+    return hesk_dbInsertID();
+}