diff --git a/ajax/ajax_asset_details.php b/ajax/ajax_asset_details.php
index f5ea387c..2fc47fb6 100644
--- a/ajax/ajax_asset_details.php
+++ b/ajax/ajax_asset_details.php
@@ -285,7 +285,14 @@ ob_start();
 
                             // Show either "-" or "AssetName - Port"
                             if ($connected_asset_name) {
-                                $connected_to_display = "<a href='asset_details.php?client_id=$client_id&asset_id=$connected_asset_id'><strong><i class='fa fa-fw fa-$connected_asset_icon mr-1'></i>$connected_asset_name</strong> - $connected_interface_name</a>";
+                                $connected_to_display = 
+                                    "<a href='#' data-toggle='ajax-modal'
+                                        data-modal-size='lg'
+                                        data-ajax-url='ajax/ajax_asset_details.php'
+                                        data-ajax-id='$connected_asset_id'>
+                                        <strong><i class='fa fa-fw fa-$connected_asset_icon mr-1'></i>$connected_asset_name</strong> - $connected_interface_name
+                                    </a>
+                                ";
                             } else {
                                 $connected_to_display = "-";
                             }
@@ -338,7 +345,7 @@ ob_start();
                         if (empty($login_username)) {
                             $login_username_display = "-";
                         } else {
-                            $login_username_display = "$login_username<button class='btn btn-sm clipboardjs' data-clipboard-text='$login_username'><i class='far fa-copy text-secondary'></i></button>";
+                            $login_username_display = "$login_username";
                         }
                         $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password']));
                         $login_otp_secret = nullable_htmlentities($row['login_otp_secret']);
@@ -385,7 +392,7 @@ ob_start();
                             </td>
                             <td><?php echo $login_username_display; ?></td>
                             <td>
-                                <button class="btn p-0" type="button" data-toggle="popover" data-trigger="focus" data-placement="top" data-content="<?php echo $login_password; ?>"><i class="fas fa-2x fa-ellipsis-h text-secondary"></i><i class="fas fa-2x fa-ellipsis-h text-secondary"></i></button><button class="btn btn-sm clipboardjs" data-clipboard-text="<?php echo $login_password; ?>"><i class="far fa-copy text-secondary"></i></button>
+                                <button class="btn p-0" type="button" data-toggle="popover" data-trigger="focus" data-placement="top" data-content="<?php echo $login_password; ?>"><i class="fas fa-2x fa-ellipsis-h text-secondary"></i><i class="fas fa-2x fa-ellipsis-h text-secondary"></i></button>
                             </td>
                             <td><?php echo $otp_display; ?></td>
                             <td><?php echo $login_uri_display; ?></td>
@@ -401,6 +408,8 @@ ob_start();
                 </table>
             </div>
         </div>
+        <!-- Include script to get TOTP code via the login ID -->
+        <script src="js/credential_show_otp_via_id.js"></script>
         <?php } ?>
 
         <?php if ($ticket_count) { ?>
diff --git a/asset_details.php b/asset_details.php
index 1af52065..ad7f816b 100644
--- a/asset_details.php
+++ b/asset_details.php
@@ -459,7 +459,12 @@ if (isset($_GET['asset_id'])) {
 
                                     // Show either "-" or "AssetName - Port"
                                     if ($connected_asset_name) {
-                                        $connected_to_display = "<a href='asset_details.php?client_id=$client_id&asset_id=$connected_asset_id'><strong><i class='fa fa-fw fa-$connected_asset_icon mr-1'></i>$connected_asset_name</strong> - $connected_interface_name</a>";
+                                        $connected_to_display = "<a href='#'
+                                            data-modal-size='lg'
+                                            data-ajax-url='ajax/ajax_asset_details.php'
+                                            data-ajax-id='$connected_asset_id'>
+                                            <strong><i class='fa fa-fw fa-$connected_asset_icon mr-1'></i>$connected_asset_name</strong> - $connected_interface_name
+                                        </a>";
                                     } else {
                                         $connected_to_display = "-";
                                     }
diff --git a/client_document_details.php b/client_document_details.php
index 00f05086..b53728eb 100644
--- a/client_document_details.php
+++ b/client_document_details.php
@@ -268,7 +268,12 @@ $page_title = $row['document_name'];
 
                 ?>
                 <div class="ml-2">
-                    <a href="asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>" target="_blank"><?php echo $asset_name; ?></a>
+                    <a href="#"
+                        data-toggle="ajax-modal"
+                        data-modal-size="lg"
+                        data-ajax-url="ajax/ajax_asset_details.php"
+                        data-ajax-id="<?php echo $asset_id; ?>">
+                        <?php echo $asset_name; ?></a>
                     <a class="confirm-link float-right" href="post.php?unlink_asset_from_document&asset_id=<?php echo $asset_id; ?>&document_id=<?php echo $document_id; ?>">
                         <i class="fas fa-fw fa-trash-alt text-secondary"></i>
                     </a>
diff --git a/js/ajax_modal.js b/js/ajax_modal.js
index 1fd88fbb..ff5aec8e 100644
--- a/js/ajax_modal.js
+++ b/js/ajax_modal.js
@@ -35,7 +35,7 @@ $(document).on('click', '[data-toggle="ajax-modal"]', function (e) {
             }
             
             // Create a modal ID by appending the ajaxId.
-            var modalId = 'ajaxModal_' + ajaxId;
+            var modalId = 'ajaxModal_' + ajaxId + '_' + new Date().getTime();
             
             // Remove any existing modal with this ID.
             $('#' + modalId).remove();