diff --git a/calendar_events.php b/calendar_events.php
index 52a29a4b..e839b2f9 100644
--- a/calendar_events.php
+++ b/calendar_events.php
@@ -147,10 +147,15 @@ while ($row = mysqli_fetch_array($sql)) {
             }
 
             //Tickets Created
-            $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");
+            $sql = mysqli_query($mysqli, "SELECT * FROM clients
+                LEFT JOIN tickets ON client_id = ticket_client_id
+                LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
+                LEFT JOIN users ON ticket_assigned_to = user_id"
+            );
             while ($row = mysqli_fetch_array($sql)) {
                 $event_id = intval($row['ticket_id']);
-                $ticket_status = strval($row['ticket_status']);
+                $ticket_status = intval($row['ticket_status']);
+                $ticket_status_name = strval($row['ticket_status_name']);
                 $username = $row['user_name'];
                 if (empty($username)) {
                     $username = "";
@@ -159,14 +164,14 @@ while ($row = mysqli_fetch_array($sql)) {
                     $username = "[". substr($row['user_name'], 0, 9) . "...]";
                 }
 
-                $event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " created - " . $row['ticket_subject'] . " " . $username . "{" . $ticket_status . "}");
+                $event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " created - " . $row['ticket_subject'] . " " . $username . "{" . $ticket_status_name . "}");
                 $event_start = json_encode($row['ticket_created_at']);
 
-                if ($ticket_status == "New") {
+                if ($ticket_status == 1) {
                     $event_color = "red";
-                } elseif ($ticket_status == "Open") {
+                } elseif ($ticket_status == 2) {
                     $event_color = "blue";
-                }  elseif ($ticket_status == "On Hold") {
+                }  elseif ($ticket_status == 3) {
                     $event_color = "grey";
                 } else {
                     $event_color = "black";
@@ -176,7 +181,12 @@ 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 = user_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 ticket_statuses ON ticket_status = ticket_status_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']);
                 $username = $row['user_name'];
@@ -188,7 +198,7 @@ while ($row = mysqli_fetch_array($sql)) {
                 }
 
                 if (strtotime($row['ticket_schedule']) < time()) {
-                    if ($row['ticket_status'] == 'On Hold') {
+                    if (!empty($row['ticket_schedule']) {
                         $event_color = "red";
                     } else {
                         $event_color = "green";
@@ -197,7 +207,7 @@ while ($row = mysqli_fetch_array($sql)) {
                     $event_color = "grey";
                 }
 
-                $ticket_status = strval($row['ticket_status']);
+                $ticket_status = strval($row['ticket_status_name']);
                 $event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " scheduled - " . $row['ticket_subject'] . " [" . $username . "]{" . $ticket_status . "}");
                 $event_start = json_encode($row['ticket_schedule']);
 
diff --git a/client_events.php b/client_events.php
index fe18fb5c..4744a753 100644
--- a/client_events.php
+++ b/client_events.php
@@ -147,10 +147,15 @@ while ($row = mysqli_fetch_array($sql)) {
                 }
 
                 //Tickets Created
-                $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 client_id = $client_id");
+                $sql = mysqli_query($mysqli, "SELECT * FROM clients
+                    LEFT JOIN tickets ON client_id = ticket_client_id
+                    LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
+                    LEFT JOIN users ON ticket_assigned_to = user_id
+                    WHERE client_id = $client_id");
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = intval($row['ticket_id']);
-                    $ticket_status = strval($row['ticket_status']);
+                    $ticket_status = intval($row['ticket_status']);
+                    $ticket_status_name = strval($row['ticket_status_name']);
                     $username = $row['user_name'];
                     if (empty($username)) {
                         $username = "";
@@ -159,14 +164,14 @@ while ($row = mysqli_fetch_array($sql)) {
                         $username = "[". substr($row['user_name'], 0, 9) . "...]";
                     }
 
-                    $event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " created - " . $row['ticket_subject'] . " " . $username . "{" . $ticket_status . "}");
+                    $event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " created - " . $row['ticket_subject'] . " " . $username . "{" . $ticket_status_name . "}");
                     $event_start = json_encode($row['ticket_created_at']);
 
-                    if ($ticket_status == "New") {
+                    if ($ticket_status == 1) {
                         $event_color = "red";
-                    } elseif ($ticket_status == "Open") {
+                    } elseif ($ticket_status == 2) {
                         $event_color = "blue";
-                    }  elseif ($ticket_status == "On Hold") {
+                    }  elseif ($ticket_status == 3) {
                         $event_color = "grey";
                     } else {
                         $event_color = "black";
@@ -176,7 +181,12 @@ 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 = user_id WHERE ticket_schedule IS NOT NULL AND client_id = $client_id");
+                $sql = mysqli_query($mysqli, "SELECT * FROM clients
+                    LEFT JOIN tickets ON client_id = ticket_client_id
+                    LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
+                    LEFT JOIN users ON ticket_assigned_to = user_id
+                    WHERE ticket_schedule IS NOT NULL AND client_id = $client_id"
+                );
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = intval($row['ticket_id']);
                     $username = $row['user_name'];
@@ -188,7 +198,7 @@ while ($row = mysqli_fetch_array($sql)) {
                     }
 
                     if (strtotime($row['ticket_schedule']) < time()) {
-                        if ($row['ticket_status'] == 'Scheduled') {
+                        if (!empty($row['ticket_schedule']) {
                             $event_color = "red";
                         } else {
                             $event_color = "green";
@@ -197,8 +207,8 @@ while ($row = mysqli_fetch_array($sql)) {
                         $event_color = "grey";
                     }
 
-                    $ticket_status = strval($row['ticket_status']);
-                    $event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " scheduled - " . $row['ticket_subject'] . " [" . $username . "]{" . $ticket_status . "}");
+                    $ticket_status_name = strval($row['ticket_status_name']);
+                    $event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " scheduled - " . $row['ticket_subject'] . " [" . $username . "]{" . $ticket_status_name . "}");
                     $event_start = json_encode($row['ticket_schedule']);