diff --git a/client_services.php b/client_services.php
index 6eb1ec6a..afd6e7a0 100644
--- a/client_services.php
+++ b/client_services.php
@@ -73,56 +73,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                     $service_importance_display = "-";
                 }
 
-
-                    // Associated Assets (and their logins/networks/locations)
-                    $sql_assets = mysqli_query($mysqli, "SELECT * FROM service_assets 
-                                                                LEFT JOIN assets 
-                                                                  ON service_assets.asset_id = assets.asset_id
-                                                                LEFT JOIN logins
-                                                                  ON service_assets.asset_id = logins.login_asset_id
-                                                                LEFT JOIN networks
-                                                                  ON assets.asset_network_id = networks.network_id
-                                                                LEFT JOIN locations
-                                                                  ON assets.asset_location_id = locations.location_id
-                                                                WHERE service_id = '$service_id'");
-
-                    // Associated logins
-                    $sql_logins = mysqli_query($mysqli, "SELECT * FROM service_logins
-                                                                LEFT JOIN logins
-                                                                  ON service_logins.login_id = logins.login_id
-                                                                WHERE service_id = '$service_id'");
-
-                    // Associated Domains
-                    $sql_domains = mysqli_query($mysqli, "SELECT * FROM service_domains
-                                                              LEFT JOIN domains
-                                                                ON service_domains.domain_id = domains.domain_id
-                                                              WHERE service_id = '$service_id'");
-
-                    // Associated URLs
-                    $sql_urls = mysqli_query($mysqli, "SELECT * FROM service_urls
-                                                                WHERE service_id = '$service_id'");
-
-                    // Associated Vendors
-                    $sql_vendors = mysqli_query($mysqli, "SELECT * FROM service_vendors
-                                                              LEFT JOIN vendors
-                                                                ON service_vendors.vendor_id = vendors.vendor_id
-                                                              WHERE service_id = '$service_id'");
-
-                    // Associated Contacts
-                    $sql_contacts = mysqli_query($mysqli, "SELECT * FROM service_contacts
-                                                              LEFT JOIN contacts
-                                                                ON service_contacts.contact_id = contacts.contact_id
-                                                              WHERE service_id = '$service_id'");
-
-                    // Associated Documents
-                    $sql_docs = mysqli_query($mysqli, "SELECT * FROM service_documents
-                                                              LEFT JOIN documents
-                                                                ON service_documents.document_id = documents.document_id
-                                                              WHERE service_id = '$service_id'");
-
-                    include("service_edit_modal.php");
-                    include("service_view_modal.php");
-
                 ?>
 
                 <tr>
@@ -148,6 +98,56 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                 </tr>
 
                 <?php
+
+                    // Associated Assets (and their logins/networks/locations)
+                    $sql_assets = mysqli_query($mysqli, "SELECT * FROM service_assets 
+                                                            LEFT JOIN assets 
+                                                              ON service_assets.asset_id = assets.asset_id
+                                                            LEFT JOIN logins
+                                                              ON service_assets.asset_id = logins.login_asset_id
+                                                            LEFT JOIN networks
+                                                              ON assets.asset_network_id = networks.network_id
+                                                            LEFT JOIN locations
+                                                              ON assets.asset_location_id = locations.location_id
+                                                            WHERE service_id = '$service_id'");
+
+                    // Associated logins
+                    $sql_logins = mysqli_query($mysqli, "SELECT * FROM service_logins
+                                                            LEFT JOIN logins
+                                                              ON service_logins.login_id = logins.login_id
+                                                            WHERE service_id = '$service_id'");
+
+                    // Associated Domains
+                    $sql_domains = mysqli_query($mysqli, "SELECT * FROM service_domains
+                                                          LEFT JOIN domains
+                                                            ON service_domains.domain_id = domains.domain_id
+                                                          WHERE service_id = '$service_id'");
+
+                    // Associated URLs
+                    $sql_urls = mysqli_query($mysqli, "SELECT * FROM service_urls
+                                                            WHERE service_id = '$service_id'");
+
+                    // Associated Vendors
+                    $sql_vendors = mysqli_query($mysqli, "SELECT * FROM service_vendors
+                                                          LEFT JOIN vendors
+                                                            ON service_vendors.vendor_id = vendors.vendor_id
+                                                          WHERE service_id = '$service_id'");
+
+                    // Associated Contacts
+                    $sql_contacts = mysqli_query($mysqli, "SELECT * FROM service_contacts
+                                                          LEFT JOIN contacts
+                                                            ON service_contacts.contact_id = contacts.contact_id
+                                                          WHERE service_id = '$service_id'");
+
+                    // Associated Documents
+                    $sql_docs = mysqli_query($mysqli, "SELECT * FROM service_documents
+                                                          LEFT JOIN documents
+                                                            ON service_documents.document_id = documents.document_id
+                                                          WHERE service_id = '$service_id'");
+
+                    include("service_edit_modal.php");
+                    include("service_view_modal.php");
+
                 }
                 ?>
 
diff --git a/post.php b/post.php
index d1d037fa..604691c6 100644
--- a/post.php
+++ b/post.php
@@ -5553,6 +5553,86 @@ if(isset($_POST['add_service'])){
     }
 }
 
+if(isset($_POST['edit_service'])){
+    $client_id = intval($_POST['client_id']);
+    $service_id = intval($_POST['service_id']);
+    $service_name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])));
+    $service_description = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['description'])));
+    $service_category = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['category']))); //TODO: Needs integration with company categories
+    $service_importance = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['importance'])));
+    $service_notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['note'])));
+
+    // Update main service details
+    mysqli_query($mysqli, "UPDATE services SET service_name = '$service_name', service_description = '$service_description', service_category = '$service_category', service_importance = '$service_importance', service_notes = '$service_notes', service_updated_at = NOW() WHERE service_id = '$service_id' AND company_id = '$session_company_id'");
+
+    // Unlink existing relations/assets
+    mysqli_query($mysqli, "DELETE FROM service_contacts WHERE service_id = '$service_id'");
+    mysqli_query($mysqli, "DELETE FROM service_vendors WHERE service_id = '$service_id'");
+    mysqli_query($mysqli, "DELETE FROM service_documents WHERE service_id = '$service_id'");
+    mysqli_query($mysqli, "DELETE FROM service_assets WHERE service_id = '$service_id'");
+    mysqli_query($mysqli, "DELETE FROM service_logins WHERE service_id = '$service_id'");
+    mysqli_query($mysqli, "DELETE FROM service_domains WHERE service_id = '$service_id'");
+
+    // Relink
+    if(!empty($_POST['contacts'])){
+        $service_contact_ids = $_POST['contacts'];
+        foreach($service_contact_ids as $contact_id){
+            if(intval($contact_id)){
+                mysqli_query($mysqli, "INSERT INTO service_contacts SET service_id = '$service_id', contact_id = '$contact_id'");
+            }
+        }
+    }
+
+    if(!empty($_POST['vendors'])){
+        $service_vendor_ids = $_POST['vendors'];
+        foreach($service_vendor_ids as $vendor_id){
+            if(intval($vendor_id)){
+                mysqli_query($mysqli, "INSERT INTO service_vendors SET service_id = '$service_id', vendor_id = '$vendor_id'");
+            }
+        }
+    }
+
+    if(!empty($_POST['documents'])){
+        $service_document_ids = $_POST['documents'];
+        foreach($service_document_ids as $document_id){
+            if(intval($document_id)){
+                mysqli_query($mysqli, "INSERT INTO service_documents SET service_id = '$service_id', document_id = '$document_id'");
+            }
+        }
+    }
+
+    if(!empty($_POST['assets'])){
+        $service_asset_ids = $_POST['assets'];
+        foreach($service_asset_ids as $asset_id){
+            if(intval($asset_id)){
+                mysqli_query($mysqli, "INSERT INTO service_assets SET service_id = '$service_id', asset_id = '$asset_id'");
+            }
+        }
+    }
+
+    if(!empty($_POST['logins'])){
+        $service_login_ids = $_POST['logins'];
+        foreach($service_login_ids as $login_id){
+            if(intval($login_id)){
+                mysqli_query($mysqli, "INSERT INTO service_logins SET service_id = '$service_id', login_id = '$login_id'");
+            }
+        }
+    }
+
+    if(!empty($_POST['logins'])){
+        $service_domain_ids = $_POST['domains'];
+        foreach($service_domain_ids as $domain_id){
+            if(intval($domain_id)){
+                mysqli_query($mysqli, "INSERT INTO service_domains SET service_id = '$service_id', domain_id = '$domain_id'");
+            }
+        }
+    }
+
+    $_SESSION['alert_message'] = "Service updated";
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if(isset($_GET['delete_service'])){
     $service_id = intval($_GET['delete_service']);
 
diff --git a/service_edit_modal.php b/service_edit_modal.php
index 29e80173..89d1e8f1 100644
--- a/service_edit_modal.php
+++ b/service_edit_modal.php
@@ -10,6 +10,7 @@
 
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="client_id" value="<?php echo $client_id ?>">
+                <input type="hidden" name="service_id" value="<?php echo $service_id ?>">
 
                 <div class="modal-body bg-white">
 
@@ -106,11 +107,12 @@
                                     $selected_ids = array_column(mysqli_fetch_all($sql_contacts,MYSQLI_ASSOC), "contact_id");
 
                                     // Get all contacts
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = '$client_id'");
+                                    // NOTE: These are called $sql_all and $row_all for a reason - anything overwriting $sql or $row will break the current while loop we are in from client_services.php
+                                    $sql_all = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = '$client_id'");
 
-                                    while($row = mysqli_fetch_array($sql)){
-                                        $contact_id = $row['contact_id'];
-                                        $contact_name = $row['contact_name'];
+                                    while($row_all = mysqli_fetch_array($sql_all)){
+                                        $contact_id = $row_all['contact_id'];
+                                        $contact_name = $row_all['contact_name'];
 
                                         if(in_array($contact_id, $selected_ids)){
                                             echo "<option value=\"$contact_id\" selected>$contact_name</option>";
@@ -131,10 +133,10 @@
                                     <?php
                                     $selected_ids = array_column(mysqli_fetch_all($sql_vendors,MYSQLI_ASSOC), "vendor_id");
 
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = '$client_id'");
-                                    while($row = mysqli_fetch_array($sql)){
-                                        $vendor_id = $row['vendor_id'];
-                                        $vendor_name = $row['vendor_name'];
+                                    $sql_all = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = '$client_id'");
+                                    while($row_all = mysqli_fetch_array($sql_all)){
+                                        $vendor_id = $row_all['vendor_id'];
+                                        $vendor_name = $row_all['vendor_name'];
 
                                         if(in_array($vendor_id, $selected_ids)){
                                             echo "<option value=\"$vendor_id\" selected>$vendor_name</option>";
@@ -155,10 +157,10 @@
                                     <?php
                                     $selected_ids = array_column(mysqli_fetch_all($sql_docs,MYSQLI_ASSOC), "document_id");
 
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_client_id = '$client_id'");
-                                    while($row = mysqli_fetch_array($sql)){
-                                        $document_id = $row['document_id'];
-                                        $document_name = $row['document_name'];
+                                    $sql_all = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_client_id = '$client_id'");
+                                    while($row_all = mysqli_fetch_array($sql_all)){
+                                        $document_id = $row_all['document_id'];
+                                        $document_name = $row_all['document_name'];
 
                                         if(in_array($document_id, $selected_ids)){
                                             echo "<option value=\"$document_id\" selected>$document_name</option>";
@@ -186,10 +188,10 @@
                                     <?php
                                     $selected_ids = array_column(mysqli_fetch_all($sql_assets,MYSQLI_ASSOC), "asset_id");
 
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = '$client_id'");
-                                    while($row = mysqli_fetch_array($sql)){
-                                        $asset_id = $row['asset_id'];
-                                        $asset_name = $row['asset_name'];
+                                    $sql_all = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = '$client_id'");
+                                    while($row_all = mysqli_fetch_array($sql_all)){
+                                        $asset_id = $row_all['asset_id'];
+                                        $asset_name = $row_all['asset_name'];
 
                                         if(in_array($asset_id, $selected_ids)){
                                             echo "<option value=\"$asset_id\" selected>$asset_name</option>";
@@ -208,29 +210,23 @@
                                 <select class="form-select" id="logins" name="logins[]" multiple="multiple">
                                     <option value="">- Logins -</option>
                                     <?php
+                                    $selected_ids = array_column(mysqli_fetch_all($sql_logins,MYSQLI_ASSOC), "login_id");
 
-                                    // Reset the $sql_assets pointer to the start
-                                    mysqli_data_seek($sql_assets, 0);
+                                    $sql_all = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_client_id = '$client_id'");
+                                    while($row_all = mysqli_fetch_array($sql_all)){
+                                        $login_id = $row_all['login_id'];
+                                        $login_name = $row_all['login_name'];
 
-                                    $selected_asset_login_ids = array_column(mysqli_fetch_all($sql_assets,MYSQLI_ASSOC), "login_id");
-                                    $selected_login_ids = array_column(mysqli_fetch_all($sql_logins,MYSQLI_ASSOC), "login_id");
-
-
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_client_id = '$client_id'");
-                                    while($row = mysqli_fetch_array($sql)){
-                                        $login_id = $row['login_id'];
-                                        $login_name = $row['login_name'];
-
-                                        if(in_array($login_id, $selected_asset_login_ids) OR in_array($login_id, $selected_login_ids)){
+                                        if(in_array($login_id, $selected_ids)){
                                             echo "<option value=\"$login_id\" selected>$login_name</option>";
                                         }
                                         else{
                                             echo "<option value=\"$login_id\">$login_name</option>";
                                         }
-
                                     }
                                     ?>
                                 </select>
+
                             </div>
 
                             <div class="form-group">
@@ -239,11 +235,19 @@
                                 <select class="form-select" id="domains" name="domains[]" multiple="multiple">
                                     <option value="">- Domains -</option>
                                     <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_client_id = '$client_id'");
-                                    while($row = mysqli_fetch_array($sql)){
-                                        $domain_id = $row['domain_id'];
-                                        $domain_name = $row['domain_name'];
-                                        echo "<option value=\"$domain_id\">$domain_name</option>";
+                                    $selected_ids = array_column(mysqli_fetch_all($sql_domains,MYSQLI_ASSOC), "domain_id");
+
+                                    $sql_all = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_client_id = '$client_id'");
+                                    while($row_all = mysqli_fetch_array($sql_all)){
+                                        $domain_id = $row_all['domain_id'];
+                                        $domain_name = $row_all['domain_name'];
+
+                                        if(in_array($domain_id, $selected_ids)){
+                                            echo "<option value=\"$domain_id\" selected>$domain_name</option>";
+                                        }
+                                        else{
+                                            echo "<option value=\"$domain_id\">$domain_name</option>";
+                                        }
                                     }
                                     ?>
                                 </select>
diff --git a/service_view_modal.php b/service_view_modal.php
index 23a118ee..78335eec 100644
--- a/service_view_modal.php
+++ b/service_view_modal.php
@@ -188,8 +188,9 @@
                                 <h5><i class="nav-icon fas fa-key"></i> Logins</h5>
                                 <ul>
                                     <?php
-                                    // Reset the $sql_assets pointer to the start
+                                    // Reset the $sql_assets/logins pointer to the start
                                     mysqli_data_seek($sql_assets, 0);
+                                    mysqli_data_seek($sql_logins, 0);
 
                                     // Showing logins linked to assets
                                     while($row = mysqli_fetch_array($sql_assets)){