diff --git a/trip_copy_modal.php b/trip_copy_modal.php
index 03f33e15..1952a7fa 100644
--- a/trip_copy_modal.php
+++ b/trip_copy_modal.php
@@ -73,12 +73,11 @@
                                 <option value="">- Driver -</option>
                                 <?php
 
-                                // WIP Need to only show users within the session company
-                                $sql_trips = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
+                                $sql_users = 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_archived_at IS NULL ORDER BY user_name ASC"
                                 );
-                                while ($row = mysqli_fetch_array($sql_trips)) {
+                                while ($row = mysqli_fetch_array($sql_users)) {
                                     $user_id_select = intval($row['user_id']);
                                     $user_name_select = nullable_htmlentities($row['user_name']);
                                     ?>
diff --git a/trip_edit_modal.php b/trip_edit_modal.php
index da8ec990..2530c19b 100644
--- a/trip_edit_modal.php
+++ b/trip_edit_modal.php
@@ -94,11 +94,11 @@
                                 <option value="">- Driver -</option>
                                 <?php
 
-                                $sql = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
+                                $sql_users = 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_archived_at > trip_created_at ORDER BY user_name ASC"
+                                    WHERE user_role > 1 AND user_archived_at > '$trip_created_at' ORDER BY user_name ASC"
                                 );
-                                while ($row = mysqli_fetch_array($sql_trips)) {
+                                while ($row = mysqli_fetch_array($sql_users)) {
                                     $user_id_select = intval($row['user_id']);
                                     $user_name_select = nullable_htmlentities($row['user_name']);
                                     ?>