diff --git a/client_service_add_modal.php b/client_service_add_modal.php
index 7d91cf4d..24108134 100644
--- a/client_service_add_modal.php
+++ b/client_service_add_modal.php
@@ -99,7 +99,7 @@
                 <label for="contacts">Select related Contacts</label>
                 <select multiple class="form-control" id="contacts" name="contacts[]">
                   <?php
-                  $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = '$client_id'");
+                  $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id");
                   while ($row = mysqli_fetch_array($sql)) {
                     $contact_id = intval($row['contact_id']);
                     $contact_name = nullable_htmlentities($row['contact_name']);
@@ -113,7 +113,7 @@
                 <label for="vendors">Select related vendors</label>
                 <select multiple class="form-control" id="vendors" name="vendors[]">
                   <?php
-                  $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_template = 0 AND vendor_client_id = '$client_id'");
+                  $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_template = 0 AND vendor_archived_at IS NULL AND vendor_client_id = $client_id");
                   while ($row = mysqli_fetch_array($sql)) {
                     $vendor_id = intval($row['vendor_id']);
                     $vendor_name = nullable_htmlentities($row['vendor_name']);
@@ -127,7 +127,7 @@
                 <label for="documents">Select related documents</label>
                 <select multiple class="form-control" id="documents" name="documents[]">
                   <?php
-                  $sql = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_client_id = '$client_id'");
+                  $sql = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_archived_at IS NULL AND document_client_id = $client_id");
                   while ($row = mysqli_fetch_array($sql)) {
                     $document_id = intval($row['document_id']);
                     $document_name = nullable_htmlentities($row['document_name']);
@@ -151,7 +151,7 @@
                     <label for="assets">Select related assets</label>
                     <select multiple class="form-control" id="assets" name="assets[]">
                       <?php
-                      $sql = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = '$client_id'");
+                      $sql = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_archived_at IS NULL AND asset_client_id = $client_id");
                       while ($row = mysqli_fetch_array($sql)) {
                         $asset_id = intval($row['asset_id']);
                         $asset_name = nullable_htmlentities($row['asset_name']);
@@ -167,7 +167,7 @@
                     <label for="logins">Select related logins</label>
                     <select multiple class="form-control" id="logins" name="logins[]">
                       <?php
-                      $sql = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_client_id = '$client_id'");
+                      $sql = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_archived_at IS NULL AND login_client_id = $client_id");
                       while ($row = mysqli_fetch_array($sql)) {
                         $login_id = intval($row['login_id']);
                         $login_name = nullable_htmlentities($row['login_name']);
@@ -188,7 +188,7 @@
                     <label for="domains">Select related domains</label>
                     <select multiple class="form-control" id="domains" name="domains[]">
                       <?php
-                      $sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_client_id = '$client_id'");
+                      $sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id");
                       while ($row = mysqli_fetch_array($sql)) {
                         $domain_id = intval($row['domain_id']);
                         $domain_name = nullable_htmlentities($row['domain_name']);
@@ -204,7 +204,7 @@
                     <label for="certificates">Select related certificates</label>
                     <select multiple class="form-control" id="certificates" name="certificates[]">
                       <?php
-                      $sql = mysqli_query($mysqli, "SELECT * FROM certificates WHERE certificate_client_id = '$client_id'");
+                      $sql = mysqli_query($mysqli, "SELECT * FROM certificates WHERE certificate_archived_at IS NULL AND certificate_client_id = $client_id");
                       while ($row = mysqli_fetch_array($sql)) {
                         $cert_id = intval($row['certificate_id']);
                         $cert_name = nullable_htmlentities($row['certificate_name']);
diff --git a/client_services.php b/client_services.php
index 205c73df..e64cc032 100644
--- a/client_services.php
+++ b/client_services.php
@@ -118,8 +118,8 @@ $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
-                            WHERE service_id = $service_id"
+                            LEFT JOIN locations ON assets.asset_location_id = locations.location_id 
+                            AND service_id = $service_id"
                         );
 
                         // Associated logins