diff --git a/client_asset_details.php b/client_asset_details.php
index f95fd002..07718006 100644
--- a/client_asset_details.php
+++ b/client_asset_details.php
@@ -47,7 +47,7 @@ if (isset($_GET['asset_id'])) {
     $contact_mobile = nullable_htmlentities($row['contact_mobile']);
     $contact_archived_at = nullable_htmlentities($row['contact_archived_at']);
     if ($contact_archived_at) {
-        $contact_name_display = "<span class='text-danger'><s>$contact_name</s></span>";
+        $contact_name_display = "<span class='text-danger' title='Archived'><s>$contact_name</s></span>";
     } else {
         $contact_name_display = $contact_name;
     }
@@ -57,7 +57,7 @@ if (isset($_GET['asset_id'])) {
     }
     $location_archived_at = nullable_htmlentities($row['location_archived_at']);
     if ($location_archived_at) {
-        $location_name_display = "<span class='text-danger'><s>$location_name</s></span>";
+        $location_name_display = "<span class='text-danger' title='Archived'><s>$location_name</s></span>";
     } else {
         $location_name_display = $location_name;
     }
diff --git a/client_assets.php b/client_assets.php
index 06de5897..81356f28 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -257,7 +257,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             }
                             $contact_archived_at = nullable_htmlentities($row['contact_archived_at']);
                             if ($contact_archived_at) {
-                                $contact_name_display = "<div class='text-danger'><s>$contact_name</s></div>";
+                                $contact_name_display = "<div class='text-danger' title='Archived'><s>$contact_name</s></div>";
                             } else {
                                 $contact_name_display = $contact_name;
                             }
@@ -268,7 +268,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             }
                             $location_archived_at = nullable_htmlentities($row['location_archived_at']);
                             if ($location_archived_at) {
-                                $location_name_display = "<div class='text-danger'><s>$location_name</s></div>";
+                                $location_name_display = "<div class='text-danger' title='Archived'><s>$location_name</s></div>";
                             } else {
                                 $location_name_display = $location_name;
                             }
diff --git a/client_contact_edit_modal.php b/client_contact_edit_modal.php
index 5bd6beee..74090ec8 100644
--- a/client_contact_edit_modal.php
+++ b/client_contact_edit_modal.php
@@ -122,14 +122,20 @@
                                         <option value="">- Location -</option>
                                         <?php
 
-                                        $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE (location_archived_at > '$contact_created_at' OR location_archived_at IS NULL) AND location_client_id = $client_id ORDER BY location_name ASC");
+                                        $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_id = $contact_location_id OR location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
                                         while ($row = mysqli_fetch_array($sql_locations)) {
                                             $location_id_select = intval($row['location_id']);
                                             $location_name_select = nullable_htmlentities($row['location_name']);
+                                            $location_archived_at = nullable_htmlentities($row['location_archived_at']);
+                                            if ($location_archived_at) {
+                                                $location_name_select_display = "($location_name_select) - ARCHIVED";
+                                            } else {
+                                                $location_name_select_display = $location_name_select;
+                                            }
                                         ?>
                                             <option <?php if ($contact_location_id == $location_id_select) {
                                                         echo "selected";
-                                                    } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select; ?></option>
+                                                    } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select_display; ?></option>
                                         <?php } ?>
 
                                     </select>
diff --git a/client_contacts.php b/client_contacts.php
index a6a856be..f4d7e4a5 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -169,7 +169,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $contact_location_id = intval($row['contact_location_id']);
                             $location_name = nullable_htmlentities($row['location_name']);
                             if (empty($location_name)) {
-                                $location_name_display = "-";
+                                $location_name = "-";
+                            }
+                            $location_archived_at = nullable_htmlentities($row['location_archived_at']);
+                            if ($location_archived_at) {
+                                $location_name_display = "<div class='text-danger' title='Archived'><s>$location_name</s></div>";
                             } else {
                                 $location_name_display = $location_name;
                             }