diff --git a/ajax/ajax_project_edit.php b/ajax/ajax_project_edit.php
index af61d3ef..71076f57 100644
--- a/ajax/ajax_project_edit.php
+++ b/ajax/ajax_project_edit.php
@@ -85,6 +85,25 @@ ob_start();
                 </select>
             </div>
         </div>
+        <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-users"></i></span>
+                </div>
+                <select class="form-control select2" name="client_id">
+                    <option value="0">- No Client -</option>
+                    <?php
+                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $select_client_id = intval($row['client_id']);
+                        $select_client_name = nullable_htmlentities($row['client_name']);
+                        ?>
+                        <option value="<?php echo $select_client_id; ?>" <?php if ($client_id == $select_client_id) { echo "selected"; } ?>><?php echo $select_client_name; ?></option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
     </div>
     <div class="modal-footer bg-white">
         <button type="submit" name="edit_project" class="btn btn-primary text-bold">
diff --git a/modals/project_add_modal.php b/modals/project_add_modal.php
index 90c047cd..8f2ba7de 100644
--- a/modals/project_add_modal.php
+++ b/modals/project_add_modal.php
@@ -88,25 +88,25 @@
                     </div>
 
                     <?php if (empty($_GET['client_id'])) { ?>
-                    <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-users"></i></span>
+                        <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-users"></i></span>
+                                </div>
+                                <select class="form-control select2" name="client_id">
+                                    <option value="0">- No Client -</option>
+                                    <?php
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                                    while ($row = mysqli_fetch_array($sql)) {
+                                        $client_id = intval($row['client_id']);
+                                        $client_name = nullable_htmlentities($row['client_name']);
+                                    ?>
+                                    <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+                                    <?php } ?>
+                                </select>
                             </div>
-                            <select class="form-control select2" name="client_id">
-                                <option vlaue="0">- No Client -</option>
-                                <?php
-                                $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
-                                while ($row = mysqli_fetch_array($sql)) {
-                                    $client_id = intval($row['client_id']);
-                                    $client_name = nullable_htmlentities($row['client_name']);
-                                ?>
-                                <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
-                                <?php } ?>
-                            </select>
                         </div>
-                    </div>
                     <?php } ?>
 
                 </div>
diff --git a/post/user/project.php b/post/user/project.php
index a8d256e1..75450b1f 100644
--- a/post/user/project.php
+++ b/post/user/project.php
@@ -25,7 +25,7 @@ if (isset($_POST['add_project'])) {
     $new_config_project_next_number = $config_project_next_number + 1;
 
     mysqli_query($mysqli, "UPDATE settings SET config_project_next_number = $new_config_project_next_number WHERE company_id = 1");
-    
+
     mysqli_query($mysqli, "INSERT INTO projects SET project_prefix = '$config_project_prefix', project_number = $project_number, project_name = '$project_name', project_description = '$project_description', project_due = '$due_date', project_manager = $project_manager, project_client_id = $client_id");
 
     $project_id = mysqli_insert_id($mysqli);
@@ -89,7 +89,7 @@ if (isset($_POST['edit_project'])) {
     $project_manager = intval($_POST['project_manager']);
     $client_id = intval($_POST['client_id']);
 
-    mysqli_query($mysqli, "UPDATE projects SET project_name = '$project_name', project_description = '$project_description', project_due = '$due_date', project_manager = $project_manager WHERE project_id = $project_id");
+    mysqli_query($mysqli, "UPDATE projects SET project_name = '$project_name', project_description = '$project_description', project_due = '$due_date', project_manager = $project_manager, project_client_id = $client_id WHERE project_id = $project_id");
 
     // Logging
     logAction("Project", "Edit", "$session_name edited project $project_name", $client_id, $project_id);
@@ -199,7 +199,7 @@ if (isset($_POST['link_ticket_to_project'])) {
     $row = mysqli_fetch_array($sql);
     $client_id = intval($row['project_client_id']);
     $project_name = sanitizeInput($row['project_name']);
-    
+
     // Add Tickets
     if (isset($_POST['tickets'])) {
 
@@ -208,14 +208,14 @@ if (isset($_POST['link_ticket_to_project'])) {
 
         foreach ($_POST['tickets'] as $ticket) {
             $ticket_id = intval($ticket);
-        
+
             // Get Ticket Info
             $sql = mysqli_query($mysqli, "SELECT ticket_prefix, ticket_number, ticket_subject FROM tickets WHERE ticket_id = $ticket_id");
             $row = mysqli_fetch_array($sql);
             $ticket_prefix = sanitizeInput($row['ticket_prefix']);
             $ticket_number = intval($row['ticket_number']);
             $ticket_subject = sanitizeInput($row['ticket_subject']);
-            
+
             mysqli_query($mysqli, "UPDATE tickets SET ticket_project_id = $project_id WHERE ticket_id = $ticket_id");
 
             // Logging
@@ -230,4 +230,4 @@ if (isset($_POST['link_ticket_to_project'])) {
     }
 
     header("Location: " . $_SERVER["HTTP_REFERER"]);
-}
\ No newline at end of file
+}