diff --git a/modals/ticket_assign_modal.php b/modals/ticket_assign_modal.php
index f3bc5656..1443bcdf 100644
--- a/modals/ticket_assign_modal.php
+++ b/modals/ticket_assign_modal.php
@@ -21,11 +21,10 @@
                             <select class="form-control select2" name="assigned_to">
                                 <option value="0">Not Assigned</option>
                                 <?php
-                                $sql_users_select = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users 
+                                $sql_users_select = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
                                     LEFT JOIN user_settings on users.user_id = user_settings.user_id
-                                    WHERE user_role > 1
                                     AND user_type = 1
-                                    AND user_archived_at IS NULL 
+                                    AND user_archived_at IS NULL
                                     ORDER BY user_name DESC"
                                 );
                                 while ($row = mysqli_fetch_array($sql_users_select)) {
diff --git a/tickets.php b/tickets.php
index 02c5c77a..b1d4f494 100644
--- a/tickets.php
+++ b/tickets.php
@@ -280,7 +280,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
                                     <option value="unassigned" <?php if ($ticket_assigned_filter_id == "0") { echo "selected"; } ?>>Unassigned</option>
 
                                     <?php
-                                    $sql_assign_to = mysqli_query($mysqli, "SELECT * FROM users WHERE user_archived_at IS NULL ORDER BY user_name ASC");
+                                    $sql_assign_to = mysqli_query($mysqli, "SELECT * FROM users WHERE user_type = 1 AND user_archived_at IS NULL ORDER BY user_name ASC");
                                     while ($row = mysqli_fetch_array($sql_assign_to)) {
                                         $user_id = intval($row['user_id']);
                                         $user_name = nullable_htmlentities($row['user_name']);