diff --git a/calendar_events.php b/calendar_events.php
index 93022352..49626bb0 100644
--- a/calendar_events.php
+++ b/calendar_events.php
@@ -125,7 +125,7 @@ while ($row = mysqli_fetch_array($sql)) {
                 }
 
                 //Tickets Scheduled
-                $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN users ON ticket_assigned_to =  ticket_client_id  WHERE ticket_schedule IS NOT NULL");
+                $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_schedule IS NOT NULL");
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = intval($row['ticket_id']);
                     if (!empty($username)) {
diff --git a/database_updates.php b/database_updates.php
index 00719206..f6841515 100644
--- a/database_updates.php
+++ b/database_updates.php
@@ -1592,7 +1592,9 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
     if (CURRENT_DATABASE_VERSION == '1.0.4') {
         //Insert queries here required to update to DB version 1.0.5
         mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_schedule` DATETIME DEFAULT NULL AFTER `ticket_billable`");
+        mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_onsite` TINYINT(1) NOT NULL DEFAULT 0 AFTER `ticket_schedule`");
         mysqli_query($mysqli, "ALTER TABLE `email_queue` ADD `email_cal_str` VARCHAR(1024) DEFAULT NULL AFTER `email_content`");
+
         // Then, update the database to the next sequential version
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.5'");
     }