diff --git a/agent/modals/trip/trip_add.php b/agent/modals/trip/trip_add.php
index 8863893a..a1eaef7c 100644
--- a/agent/modals/trip/trip_add.php
+++ b/agent/modals/trip/trip_add.php
@@ -112,7 +112,7 @@ ob_start();
         </div>
 
         <?php if ($client_id) { ?>
-            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
         <?php }else{ ?>
 
             <div class="form-group">
@@ -121,7 +121,7 @@ ob_start();
                     <div class="input-group-prepend">
                         <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                     </div>
-                    <select class="form-control select2" name="client" required>
+                    <select class="form-control select2" name="client_id" required>
                         <option value="0">- Client (Optional) -</option>
                         <?php
 
diff --git a/agent/modals/trip/trip_copy.php b/agent/modals/trip/trip_copy.php
index 09aa634c..99fb3d8f 100644
--- a/agent/modals/trip/trip_copy.php
+++ b/agent/modals/trip/trip_copy.php
@@ -131,7 +131,7 @@ ob_start();
         </div>
 
         <?php if (isset($_GET['client_id'])) { ?>
-            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
         <?php } else { ?>
 
             <div class="form-group">
@@ -140,7 +140,7 @@ ob_start();
                     <div class="input-group-prepend">
                         <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                     </div>
-                    <select class="form-control select2" name="client">
+                    <select class="form-control select2" name="client_id">
                         <option value="">- Client (Optional) -</option>
                         <?php
 
diff --git a/agent/modals/trip/trip_edit.php b/agent/modals/trip/trip_edit.php
index 814c01a0..58423915 100644
--- a/agent/modals/trip/trip_edit.php
+++ b/agent/modals/trip/trip_edit.php
@@ -131,42 +131,6 @@ ob_start();
             </div>
         </div>
 
-        <?php if (isset($_GET['client_id'])) { ?>
-            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-        <?php } else { ?>
-
-            <div class="form-group">
-                <label>Client</label>
-                <div class="input-group">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                    </div>
-                    <select class="form-control select2" name="client">
-                        <option value="">- Client (Optional) -</option>
-                        <?php
-
-                        $sql_clients = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at > '$trip_created_at' OR client_archived_at IS NULL ORDER BY client_archived_at ASC, client_name ASC");
-                        while ($row = mysqli_fetch_assoc($sql_clients)) {
-                            $client_id_select = intval($row['client_id']);
-                            $client_name_select = nullable_htmlentities($row['client_name']);
-                            $client_archived_at = nullable_htmlentities($row['client_archived_at']);
-                            if (empty($client_archived_at)) {
-                                $client_archived_display = "";
-                            } else {
-                                $client_archived_display = "Archived - ";
-                            }
-                            ?>
-                            <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo "$client_archived_display$client_name_select"; ?></option>
-
-                            <?php
-                        }
-                        ?>
-                    </select>
-                </div>
-            </div>
-
-        <?php } ?>
-
     </div>
 
     <div class="modal-footer">
diff --git a/agent/post/trip.php b/agent/post/trip.php
index fc2d41e7..378faf90 100644
--- a/agent/post/trip.php
+++ b/agent/post/trip.php
@@ -14,7 +14,7 @@ if (isset($_POST['add_trip'])) {
 
     require_once 'trip_model.php';
 
-    $client_id = intval($_POST['client']);
+    $client_id = intval($_POST['client_id']);
 
     if ($client_id) {
         enforceClientAccess();