diff --git a/client_contact_details.php b/client_contact_details.php
index 2c6397dc..43bbb910 100644
--- a/client_contact_details.php
+++ b/client_contact_details.php
@@ -44,7 +44,13 @@ if (isset($_GET['contact_id'])) {
     $asset_count = mysqli_num_rows($sql_related_assets);
 
     // Related Logins Query
-    $sql_related_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_contact_id = $contact_id ORDER BY login_name DESC");
+    $sql_related_logins = mysqli_query($mysqli, "SELECT * FROM logins
+        LEFT JOIN login_tags ON login_tags.login_id = logins.login_id
+        LEFT JOIN tags ON tags.tag_id = login_tags.tag_id
+        WHERE login_contact_id = $contact_id
+        GROUP BY logins.login_id
+        ORDER BY login_name DESC
+    ");
     $login_count = mysqli_num_rows($sql_related_logins);
 
     // Related Software Query
@@ -377,6 +383,28 @@ if (isset($_GET['contact_id'])) {
                                 $login_asset_id = intval($row['login_asset_id']);
                                 $login_software_id = intval($row['login_software_id']);
 
+                                // Tags
+                                $login_tag_name_display_array = array();
+                                $login_tag_id_array = array();
+                                $sql_login_tags = mysqli_query($mysqli, "SELECT * FROM login_tags LEFT JOIN tags ON login_tags.tag_id = tags.tag_id WHERE login_id = $login_id ORDER BY tag_name ASC");
+                                while ($row = mysqli_fetch_array($sql_login_tags)) {
+
+                                    $login_tag_id = intval($row['tag_id']);
+                                    $login_tag_name = nullable_htmlentities($row['tag_name']);
+                                    $login_tag_color = nullable_htmlentities($row['tag_color']);
+                                    if (empty($login_tag_color)) {
+                                        $login_tag_color = "dark";
+                                    }
+                                    $login_tag_icon = nullable_htmlentities($row['tag_icon']);
+                                    if (empty($login_tag_icon)) {
+                                        $login_tag_icon = "tag";
+                                    }
+
+                                    $login_tag_id_array[] = $login_tag_id;
+                                    $login_tag_name_display_array[] = "<a href='client_logins.php?client_id=$client_id&tags[]=$login_tag_id'><span class='badge text-light p-1 mr-1' style='background-color: $login_tag_color;'><i class='fa fa-fw fa-$login_tag_icon mr-2'></i>$login_tag_name</span></a>";
+                                }
+                                $login_tags_display = implode('', $login_tag_name_display_array);
+
                                 ?>
                                 <tr>
                                     <td>
diff --git a/client_logins.php b/client_logins.php
index f1dfd7bf..c4327fba 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -56,6 +56,7 @@ $sql = mysqli_query(
     AND l.login_$archive_query
     AND (l.login_name LIKE '%$q%' OR l.login_description LIKE '%$q%' OR l.login_uri LIKE '%$q%' OR tag_name LIKE '%$q%')
     $location_query
+    GROUP BY l.login_id
     ORDER BY l.login_important DESC, $sort $order LIMIT $record_from, $record_to"
 );