diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index 7e924a61..2a0a25c0 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -70,7 +70,12 @@
                 <option value="0">Not Assigned</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM users, user_companies WHERE users.user_id = user_companies.user_id AND user_archived_at IS NULL AND user_companies.company_id = $session_company_id ORDER BY user_name ASC");
+                //$sql = mysqli_query($mysqli,"SELECT * FROM users, user_companies WHERE users.user_id = user_companies.user_id AND user_archived_at IS NULL AND user_companies.company_id = $session_company_id ORDER BY user_name ASC");
+                $sql = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
+                                                    LEFT JOIN user_companies ON users.user_id = user_companies.user_id
+                                                    LEFT JOIN user_settings on users.user_id = user_settings.user_id
+                                                    WHERE user_companies.company_id = $session_company_id 
+                                                    AND user_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC");
                 while($row = mysqli_fetch_array($sql)){
                   $user_id = $row['user_id'];
                   $user_name = $row['user_name'];
diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php
index f9519890..17e6cb11 100644
--- a/ticket_edit_modal.php
+++ b/ticket_edit_modal.php
@@ -21,7 +21,11 @@
                 <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 AND user_archived_at IS NULL ORDER BY user_name ASC");
+                $sql_assign_to_select = mysqli_query($mysqli,"SELECT users.user_id, user_name FROM users
+                                                                LEFT JOIN user_companies ON users.user_id = user_companies.user_id
+                                                                LEFT JOIN user_settings on users.user_id = user_settings.user_id
+                                                                WHERE user_companies.company_id = $session_company_id 
+                                                                AND user_role > 1 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'];