diff --git a/ajax.php b/ajax.php
index 10b39daa..55057c40 100644
--- a/ajax.php
+++ b/ajax.php
@@ -417,11 +417,39 @@ if (isset($_GET['get_client_contacts'])) {
 }
 
 /*
- * Dynamic TOTP for client login page
+ * Dynamic TOTP "resolver"
  * When provided with a TOTP secret, returns a 6-digit code
+ * // TODO: Check if this can now be removed
  */
 if (isset($_GET['get_totp_token'])) {
     $otp = TokenAuth6238::getTokenCode(strtoupper($_GET['totp_secret']));
 
     echo json_encode($otp);
 }
+
+/*
+ * NEW TOTP getter for client login/passwords page
+ * When provided with a login ID, checks permissions and returns the 6-digit code
+ */
+if (isset($_GET['get_totp_token_via_id'])) {
+    validateTechRole();
+
+    $login_id = intval($_GET['login_id']);
+
+    $sql = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT login_name, login_otp_secret, login_client_id FROM logins WHERE login_id = $login_id"));
+    $name = sanitizeInput($sql['login_name']);
+    $totp_secret = $sql['login_otp_secret'];
+    $client_id = intval($sql['login_client_id']);
+
+    $otp = TokenAuth6238::getTokenCode(strtoupper($totp_secret));
+    echo json_encode($otp);
+
+    // Logging
+    //  Only log the TOTP view if the user hasn't already viewed this specific login entry recently, this prevents logs filling if a user hovers across an entry a few times
+    $check_recent_totp_view_logged_sql = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(log_id) AS recent_totp_view FROM logs WHERE log_type = 'Login' AND log_action = 'View TOTP' AND log_user_id = $session_user_id AND log_entity_id = $login_id AND log_client_id = $client_id AND log_created_at > (NOW() - INTERVAL 5 MINUTE)"));
+    $recent_totp_view_logged_count = intval($check_recent_totp_view_logged_sql['recent_totp_view']);
+
+    if ($recent_totp_view_logged_count == 0) {
+        mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Login', log_action = 'View TOTP', log_description = '$session_name viewed login TOTP code for $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $login_id");
+    }
+}
diff --git a/client_logins.php b/client_logins.php
index 264f4cf6..53a26ee9 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -95,7 +95,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     if (empty($login_otp_secret)) {
                         $otp_display = "-";
                     } else {
-                        $otp_display = "<span onmouseenter='showOTP($login_id_with_secret)'><i class='far fa-clock'></i> <span id='otp_$login_id'><i>Hover..</i></span></span>";
+                        $otp_display = "<span onmouseenter='showOTPViaLoginID($login_id)'><i class='far fa-clock'></i> <span id='otp_$login_id'><i>Hover..</i></span></span>";
                     }
                     $login_note = nullable_htmlentities($row['login_note']);
                     $login_important = intval($row['login_important']);
@@ -157,6 +157,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <script>
+    // TODO: Remove this
     function showOTP(id, secret) {
         //Send a GET request to ajax.php as ajax.php?get_totp_token=true&totp_secret=SECRET
         jQuery.get(
@@ -172,6 +173,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         );
     }
 
+    function showOTPViaLoginID(login_id) {
+        // Send a GET request to ajax.php as ajax.php?get_totp_token_via_id=true&login_id=ID
+        jQuery.get(
+            "ajax.php",
+            {get_totp_token_via_id: 'true', login_id: login_id},
+            function(data) {
+                //If we get a response from post.php, parse it as JSON
+                const token = JSON.parse(data);
+
+                document.getElementById("otp_" + login_id).innerText = token
+
+            }
+        );
+    }
+
     function generatePassword() {
         document.getElementById("password").value = "<?php echo randomString(); ?>"
     }