diff --git a/client_service_edit_modal.php b/client_service_edit_modal.php
index e7e18847..c431a5b3 100644
--- a/client_service_edit_modal.php
+++ b/client_service_edit_modal.php
@@ -105,7 +105,8 @@
 
                   // Get all contacts
                   // 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");
+
+                  $sql_all = mysqli_query($mysqli, "SELECT * FROM contacts WHERE (contact_archived_at > '$service_created_at' OR contact_archived_at IS NULL) AND contact_client_id = $client_id");
 
                   while ($row_all = mysqli_fetch_array($sql_all)) {
                     $contact_id = intval($row_all['contact_id']);
@@ -128,7 +129,7 @@
                   <?php
                   $selected_ids = array_column(mysqli_fetch_all($sql_vendors, MYSQLI_ASSOC), "vendor_id");
 
-                  $sql_all = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_template = 0 AND vendor_client_id = '$client_id'");
+                  $sql_all = mysqli_query($mysqli, "SELECT * FROM vendors WHERE (vendor_archived_at > '$service_created_at' OR vendor_archived_at IS NULL) AND vendor_template = 0 AND vendor_client_id = $client_id");
                   while ($row_all = mysqli_fetch_array($sql_all)) {
                     $vendor_id = intval($row_all['vendor_id']);
                     $vendor_name = nullable_htmlentities($row_all['vendor_name']);
@@ -150,7 +151,7 @@
                   <?php
                   $selected_ids = array_column(mysqli_fetch_all($sql_docs, MYSQLI_ASSOC), "document_id");
 
-                  $sql_all = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_client_id = '$client_id'");
+                  $sql_all = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_archived_at IS NULL AND document_client_id = $client_id");
                   while ($row_all = mysqli_fetch_array($sql_all)) {
                     $document_id = intval($row_all['document_id']);
                     $document_name = nullable_htmlentities($row_all['document_name']);
@@ -183,7 +184,7 @@
                       <?php
                       $selected_ids = array_column(mysqli_fetch_all($sql_assets, MYSQLI_ASSOC), "asset_id");
 
-                      $sql_all = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = '$client_id'");
+                      $sql_all = mysqli_query($mysqli, "SELECT * FROM assets WHERE (asset_archived_at > '$service_created_at' OR asset_archived_at IS NULL) AND asset_client_id = $client_id");
                       while ($row_all = mysqli_fetch_array($sql_all)) {
                         $asset_id = intval($row_all['asset_id']);
                         $asset_name = nullable_htmlentities($row_all['asset_name']);
@@ -207,7 +208,7 @@
                       <?php
                       $selected_ids = array_column(mysqli_fetch_all($sql_logins, MYSQLI_ASSOC), "login_id");
 
-                      $sql_all = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_client_id = '$client_id'");
+                      $sql_all = mysqli_query($mysqli, "SELECT * FROM logins WHERE (login_archived_at > '$service_created_at' OR login_archived_at IS NULL) AND login_client_id = $client_id");
                       while ($row_all = mysqli_fetch_array($sql_all)) {
                         $login_id = intval($row_all['login_id']);
                         $login_name = nullable_htmlentities($row_all['login_name']);
@@ -236,7 +237,7 @@
                       <?php
                       $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'");
+                      $sql_all = mysqli_query($mysqli, "SELECT * FROM domains WHERE (domain_archived_at > '$service_created_at' OR domain_archived_at IS NULL) AND domain_client_id = $client_id");
                       while ($row_all = mysqli_fetch_array($sql_all)) {
                         $domain_id = intval($row_all['domain_id']);
                         $domain_name = nullable_htmlentities($row_all['domain_name']);
@@ -260,7 +261,7 @@
                       <?php
                       $selected_ids = array_column(mysqli_fetch_all($sql_certificates, MYSQLI_ASSOC), "certificate_id");
 
-                      $sql_all = mysqli_query($mysqli, "SELECT * FROM certificates WHERE certificate_client_id = '$client_id'");
+                      $sql_all = mysqli_query($mysqli, "SELECT * FROM certificates WHERE (certificate_archived_at > '$service_created_at' OR certificate_archived_at IS NULL) AND certificate_client_id = $client_id");
                       while ($row_all = mysqli_fetch_array($sql_all)) {
                         $cert_id = intval($row_all['certificate_id']);
                         $cert_name = nullable_htmlentities($row_all['certificate_name']);
diff --git a/client_services.php b/client_services.php
index e64cc032..c06d0696 100644
--- a/client_services.php
+++ b/client_services.php
@@ -118,7 +118,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             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 
+                            LEFT JOIN locations ON assets.asset_location_id = locations.location_id
                             AND service_id = $service_id"
                         );