diff --git a/admin/calendar.php b/admin/calendar.php
index ab22f04e..0d33b4c1 100644
--- a/admin/calendar.php
+++ b/admin/calendar.php
@@ -369,6 +369,29 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             </div>
                         </div>
                     </div>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="form-group">
+                                <label for="reminder" class="col-sm-3 control-label">
+                                    Reminder
+                                    <i class="fa fa-question-circle settingsquestionmark"
+                                       data-toggle="tooltip"
+                                       title="Receive an e-mail reminder for this event. Only you will receive this reminder email."></i>
+                                </label>
+                                <div class="col-sm-2">
+                                    <input type="text" name="reminder-value" class="form-control" placeholder="#">
+                                </div>
+                                <div class="col-sm-4">
+                                    <select name="reminder-unit" class="form-control">
+                                        <option value="0">minutes before event</option>
+                                        <option value="1">hours before event</option>
+                                        <option value="2">days before event</option>
+                                        <option value="3">weeks before event</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                     <div class="row">
                         <div class="col-md-12">
                             <div class="form-group">
diff --git a/internal-api/dao/calendar_dao.php b/internal-api/dao/calendar_dao.php
index 326d2c56..d4ef4da4 100644
--- a/internal-api/dao/calendar_dao.php
+++ b/internal-api/dao/calendar_dao.php
@@ -1,11 +1,16 @@
 <?php
 
 function get_events($start, $end, $hesk_settings, $staff = true) {
-    $sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`color` AS `category_color`
+    $sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`color` AS `category_color`,
+        `reminders`.`amount` AS `reminder_value`, `reminders`.`unit` AS `reminder_unit`
         FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event` AS `events`
         INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` AS `categories`
-            ON `events`.`category` = `categories`.`id`
-        WHERE `start` >= FROM_UNIXTIME(" . hesk_dbEscape($start)
+            ON `events`.`category` = `categories`.`id` ";
+    if ($staff) {
+        $sql .= "LEFT JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event_reminder` AS `reminders` ON
+        `reminders`.`user_id` = " . intval($_SESSION['id']) . " AND `reminders`.`event_id` = `events`.`id`";
+    }
+    $sql .= "WHERE `start` >= FROM_UNIXTIME(" . hesk_dbEscape($start)
         . " / 1000) AND `end` <= FROM_UNIXTIME(" . hesk_dbEscape($end) . " / 1000) AND `categories`.`usage` <> 1";
 
     if (!$staff) {
@@ -27,6 +32,8 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
         $event['categoryId'] = $row['category'];
         $event['categoryName'] = $row['category_name'];
         $event['categoryColor'] = $row['category_color'];
+        $event['reminderValue'] = $row['reminder_value'];
+        $event['reminderUnit'] = $row['reminder_unit'];
         $events[] = $event;
     }
 
diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js
index 4edb1821..c97a66ad 100644
--- a/js/calendar/mods-for-hesk-calendar.js
+++ b/js/calendar/mods-for-hesk-calendar.js
@@ -407,7 +407,9 @@ function displayEditModal(date) {
         .find('textarea[name="comments"]').val(date.comments).end()
         .find('input[name="start-date"]').val(date.start.format('YYYY-MM-DD')).end()
         .find('input[name="end-date"]').val(date.end.format('YYYY-MM-DD')).end()
-        .find('input[name="id"]').val(date.id).end();
+        .find('input[name="id"]').val(date.id).end()
+        .find('input[name="reminder-value"]').val(date.reminderValue).end()
+        .find('select[name="reminder-units"]').val(date.reminderUnits).end();
 
     var createTicketLink = getHelpdeskUrl() + '/' + getAdminDirectory() + '/new_ticket.php?subject=';
     createTicketLink += encodeURI('[' + date.start.format('YYYY-MM-DD') + '] ' + date.title);