diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php
index e0d5a9ba..f9519890 100644
--- a/ticket_edit_modal.php
+++ b/ticket_edit_modal.php
@@ -21,7 +21,7 @@
                 <option value="0">Not Assigned</option>
                 <?php 
                 
-                $sql_assign_to_select = mysqli_query($mysqli,"SELECT * FROM users, user_companies WHERE users.user_id = user_companies.user_id AND user_companies.company_id = $session_company_id ORDER BY user_name ASC");
+                $sql_assign_to_select = mysqli_query($mysqli,"SELECT * FROM users, user_companies WHERE users.user_id = user_companies.user_id AND user_companies.company_id = $session_company_id AND user_archived_at IS NULL ORDER BY user_name ASC");
                 while($row = mysqli_fetch_array($sql_assign_to_select)){
                   $user_id = $row['user_id'];
                   $user_name = $row['user_name'];
diff --git a/tickets.php b/tickets.php
index 1ed89b05..f40b6286 100644
--- a/tickets.php
+++ b/tickets.php
@@ -279,7 +279,7 @@ $user_active_assigned_tickets = $row['total_tickets_assigned'];
                                     <option value="unassigned"<?php if($ticket_assigned_filter == "0"){echo "selected";}?> >Unassigned</option>
 
                                     <?php
-                                    $sql_assign_to = mysqli_query($mysqli,"SELECT * FROM users ORDER BY user_name ASC");
+                                    $sql_assign_to = mysqli_query($mysqli,"SELECT * FROM users WHERE user_archived_at IS NULL ORDER BY user_name ASC");
                                     while($row = mysqli_fetch_array($sql_assign_to)){
                                         $user_id = $row['user_id'];
                                         $user_name = $row['user_name'];