diff --git a/client_assets.php b/client_assets.php
index fb963d7e..4b052185 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -285,15 +285,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <th>
                                     <i class="fa fa-fw text-secondary fa-<?php echo $device_icon; ?> mr-2"></i>
                                     <a class="text-secondary" href="client_asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>"><?php echo $asset_name; ?></a>
-                                    <?php if(!empty($asset_uri)){ ?>
+                                    <?php if (!empty($asset_uri)) { ?>
                                         <a href="<?php echo $asset_uri; ?>" target="_blank"><i class="fas fa-fw fa-external-link-alt ml-2"></i></a>
-                                    <?php } ?>
-                                    <?php
-                                    if ($login_count > 0) {
-                                        ?>
-                                        <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#viewPasswordModal<?php echo $login_id; ?>"><i class="fas fa-key text-dark"></i></button>
+                                    <?php }
 
-                                        <div class="modal" id="viewPasswordModal<?php echo $login_id; ?>" tabindex="-1">
+                                    if ($login_count > 0) { ?>
+                                        <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#viewPasswordModal<?php echo $asset_id; ?>"><i class="fas fa-key text-dark"></i></button>
+
+                                        <div class="modal" id="viewPasswordModal<?php echo $asset_id; ?>" tabindex="-1">
                                             <div class="modal-dialog">
                                                 <div class="modal-content bg-dark">
                                                     <div class="modal-header">
@@ -303,35 +302,39 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                         </button>
                                                     </div>
                                                     <div class="modal-body bg-white">
-                                                        <?php
-                                                        while ($row = mysqli_fetch_array($sql_logins)) {
+
+                                                        <?php while ($row = mysqli_fetch_array($sql_logins)) {
                                                             $login_id = intval($row['login_id']);
                                                             $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username']));
                                                             $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password']));
-                                                        ?>
-                                                        <div class="form-group">
-                                                            <div class="input-group">
-                                                                <div class="input-group-prepend">
-                                                                    <span class="input-group-text"><i class="fa fa-user"></i></span>
-                                                                </div>
-                                                                <input type="text" class="form-control" value="<?php echo $login_username; ?>" readonly>
-                                                                <div class="input-group-append">
-                                                                    <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_username; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                                                            ?>
+
+                                                            <div class="form-group">
+                                                                <div class="input-group">
+                                                                    <div class="input-group-prepend">
+                                                                        <span class="input-group-text"><i class="fa fa-user"></i></span>
+                                                                    </div>
+                                                                    <input type="text" class="form-control" value="<?php echo $login_username; ?>" readonly>
+                                                                    <div class="input-group-append">
+                                                                        <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_username; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                                                                    </div>
                                                                 </div>
                                                             </div>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <div class="input-group">
-                                                                <div class="input-group-prepend">
-                                                                    <span class="input-group-text"><i class="fa fa-lock"></i></span>
-                                                                </div>
-                                                                <input type="text" class="form-control" value="<?php echo $login_password; ?>" readonly autocomplete="off">
-                                                                <div class="input-group-append">
-                                                                    <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_password; ?>"><i class="fa fa-fw fa-copy"></i></button>
+
+                                                            <div class="form-group">
+                                                                <div class="input-group">
+                                                                    <div class="input-group-prepend">
+                                                                        <span class="input-group-text"><i class="fa fa-lock"></i></span>
+                                                                    </div>
+                                                                    <input type="text" class="form-control" value="<?php echo $login_password; ?>" readonly autocomplete="off">
+                                                                    <div class="input-group-append">
+                                                                        <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_password; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                                                                    </div>
                                                                 </div>
                                                             </div>
-                                                        </div>
+
                                                         <?php } ?>
+
                                                     </div>
                                                 </div>
                                             </div>
diff --git a/client_login_add_modal.php b/client_login_add_modal.php
index ddcc799d..00aab3e3 100644
--- a/client_login_add_modal.php
+++ b/client_login_add_modal.php
@@ -175,12 +175,19 @@
                                         <option value="">- Asset -</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN locations on asset_location_id = location_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $asset_id = intval($row['asset_id']);
                                             $asset_name = nullable_htmlentities($row['asset_name']);
+                                            $asset_location = nullable_htmlentities($row['location_name']);
+
+                                            $asset_display_string = $asset_name;
+                                            if (!empty($asset_location)) {
+                                                $asset_display_string = "$asset_name ($asset_location)";
+                                            }
+
                                             ?>
-                                            <option value="<?php echo $asset_id; ?>"><?php echo $asset_name; ?></option>
+                                            <option value="<?php echo $asset_id; ?>"><?php echo $asset_display_string; ?></option>
 
                                             <?php
                                         }
diff --git a/client_login_edit_modal.php b/client_login_edit_modal.php
index 209184f0..dfe8ed53 100644
--- a/client_login_edit_modal.php
+++ b/client_login_edit_modal.php
@@ -184,12 +184,19 @@
                                         <option value="0">- None -</option>
                                         <?php
 
-                                        $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
+                                        $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN locations on asset_location_id = location_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
                                         while ($row = mysqli_fetch_array($sql_assets)) {
                                             $asset_id_select = intval($row['asset_id']);
                                             $asset_name_select = nullable_htmlentities($row['asset_name']);
+                                            $asset_location_select = nullable_htmlentities($row['location_name']);
+
+                                            $asset_select_display_string = $asset_name_select;
+                                            if (!empty($asset_location_select)) {
+                                                $asset_select_display_string = "$asset_name_select ($asset_location_select)";
+                                            }
+
                                             ?>
-                                            <option <?php if ($login_asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
+                                            <option <?php if ($login_asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_select_display_string; ?></option>
 
                                         <?php } ?>
                                     </select>