diff --git a/API.md b/API.md
index 5961deec..c1975144 100644
--- a/API.md
+++ b/API.md
@@ -1066,12 +1066,14 @@ Returns:
         [{"friendly_name": "Jon Snow",
           "total_plays": 170,
           "user_id": 133788,
-          "user_thumb": "https://plex.tv/users/k10w42309cynaopq/avatar"
+          "user_thumb": "https://plex.tv/users/k10w42309cynaopq/avatar",
+          "username": "LordCommanderSnow"
           },
          {"platform_type": "DanyKhaleesi69",
           "total_plays": 42,
           "user_id": 8008135,
-          "user_thumb": "https://plex.tv/users/568gwwoib5t98a3a/avatar"
+          "user_thumb": "https://plex.tv/users/568gwwoib5t98a3a/avatar",
+          "username: "DanyKhaleesi69"
           },
          {...},
          {...}
@@ -2545,6 +2547,7 @@ Returns:
               "transcode_decision": "transcode",
               "user_id": 133788,
               "user_thumb": "https://plex.tv/users/568gwwoib5t98a3a/avatar",
+              "username": "LordCommanderSnow",
               "year": 2016
               },
              {...},
diff --git a/data/interfaces/default/css/tautulli.css b/data/interfaces/default/css/tautulli.css
index 2c9163fa..0cedff04 100644
--- a/data/interfaces/default/css/tautulli.css
+++ b/data/interfaces/default/css/tautulli.css
@@ -1031,7 +1031,7 @@ a .users-poster-face:hover {
     height: 249px;
 }
 .dashboard-activity-container:hover .dashboard-activity-progress {
-	height: 14px;
+    height: 14px;
 }
 .dashboard-activity-container:hover .progress-bar {
     color: rgba(255, 255, 255, 1);
diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html
index e280e39e..4643af6e 100644
--- a/data/interfaces/default/current_activity_instance.html
+++ b/data/interfaces/default/current_activity_instance.html
@@ -397,7 +397,7 @@ DOCUMENTATION :: END
         </div>
     </div>
     <div class="dashboard-activity-metadata-wrapper">
-        <a href="${user_href}" title="${data['friendly_name']}">
+        <a href="${user_href}" title="${data['username']}">
             <div class="dashboard-activity-metadata-user-thumb" style="background-image: url(${data['user_thumb']});"></div>
         </a>
         <div class="dashboard-activity-metadata-title-container">
@@ -521,7 +521,7 @@ DOCUMENTATION :: END
                 % endif
             </div>
             <div class="dashboard-activity-metadata-user">
-                <a href="${user_href}" title="${data['friendly_name']}">${data['friendly_name']}</a>
+                <a href="${user_href}" title="${data['username']}">${data['friendly_name']}</a>
             </div>
         </div>
     </div>
diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js
index 584511a7..6f193464 100644
--- a/data/interfaces/default/js/tables/history_table.js
+++ b/data/interfaces/default/js/tables/history_table.js
@@ -83,9 +83,9 @@ history_table_options = {
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
                     if (rowData['user_id']) {
-                        $(td).html('<a href="' + page('user', rowData['user_id']) + '">' + cellData + '</a>');
+                        $(td).html('<a href="' + page('user', rowData['user_id']) + '" title="' + rowData['user'] + '">' + cellData + '</a>');
                     } else {
-                        $(td).html('<a href="' + page('user', null, rowData['user']) + '">' + cellData + '</a>');
+                        $(td).html('<a href="' + page('user', null, rowData['user']) + '" title="' + rowData['user'] + '">' + cellData + '</a>');
                     }
                 } else {
                     $(td).html(cellData);
diff --git a/data/interfaces/default/js/tables/sync_table.js b/data/interfaces/default/js/tables/sync_table.js
index 81d45633..fcccef0e 100644
--- a/data/interfaces/default/js/tables/sync_table.js
+++ b/data/interfaces/default/js/tables/sync_table.js
@@ -51,9 +51,9 @@ sync_table_options = {
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
                     if (rowData['user_id']) {
-                        $(td).html('<a href="' + page('user', rowData['user_id']) + '">' + cellData + '</a>');
+                        $(td).html('<a href="' + page('user', rowData['user_id']) + '" title="' + rowData['username'] + '">' + cellData + '</a>');
                     } else {
-                        $(td).html('<a href="' + page('user', null, rowData['user']) + '">' + cellData + '</a>');
+                        $(td).html('<a href="' + page('user', null, rowData['user']) + '" title="' + rowData['username'] + '">' + cellData + '</a>');
                     }
                 } else {
                     $(td).html(cellData);
diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js
index da2fc08e..5e6f03cd 100644
--- a/data/interfaces/default/js/tables/users.js
+++ b/data/interfaces/default/js/tables/users.js
@@ -78,7 +78,7 @@ users_list_table_options = {
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== null && cellData !== '') {
                     $(td).html('<div class="edit-user-name" data-id="' + rowData['row_id'] + '">' +
-                        '<a href="' + page('user', rowData['user_id']) + '">' + cellData + '</a>' +
+                        '<a href="' + page('user', rowData['user_id']) + '" title="' + rowData['username'] + '">' + cellData + '</a>' +
                         '<input type="text" class="hidden" value="' + cellData + '">' +
                         '</div>');
                 } else {
diff --git a/data/interfaces/default/library_user_stats.html b/data/interfaces/default/library_user_stats.html
index cd6ccc7e..ebd2c41f 100644
--- a/data/interfaces/default/library_user_stats.html
+++ b/data/interfaces/default/library_user_stats.html
@@ -25,11 +25,11 @@ DOCUMENTATION :: END
     <div class="user-player-instance">
         <li>
             % if a['user_id']:
-            <a href="${page('user', a['user_id'])}" title="${a['friendly_name']}">
+            <a href="${page('user', a['user_id'])}" title="${a['username']}">
                 <div class="library-user-instance-box" style="background-image: url(${a['user_thumb']});"></div>
             </a>
             <div class=" user-player-instance-name">
-                <a href="${page('user', a['user_id'])}" title="${a['friendly_name']}">${a['friendly_name']}</a>
+                <a href="${page('user', a['user_id'])}" title="${a['username']}">${a['friendly_name']}</a>
             </div>
             % else:
             <div class="library-user-instance-box" style="background-image: url(${a['user_thumb']});"></div>
diff --git a/plexpy/libraries.py b/plexpy/libraries.py
index d70473b3..e73c6724 100644
--- a/plexpy/libraries.py
+++ b/plexpy/libraries.py
@@ -791,7 +791,7 @@ class Libraries(object):
             if str(section_id).isdigit():
                 query = 'SELECT (CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = "" ' \
                         'THEN users.username ELSE users.friendly_name END) AS friendly_name, ' \
-                        'users.user_id, users.thumb, users.custom_avatar_url AS custom_thumb, ' \
+                        'users.user_id, users.username, users.thumb, users.custom_avatar_url AS custom_thumb, ' \
                         'COUNT(DISTINCT %s) AS user_count ' \
                         'FROM session_history ' \
                         'JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \
@@ -817,6 +817,7 @@ class Libraries(object):
             row = {'friendly_name': item['friendly_name'],
                    'user_id': item['user_id'],
                    'user_thumb': user_thumb,
+                   'username': item['username'],
                    'total_plays': item['user_count']
                    }
             user_stats.append(row)
diff --git a/plexpy/users.py b/plexpy/users.py
index 7d6d6ae3..c338f26b 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -118,6 +118,7 @@ class Users(object):
 
         columns = ['users.id AS row_id',
                    'users.user_id',
+                   'users.username',
                    '(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = "" \
                     THEN users.username ELSE users.friendly_name END) AS friendly_name',
                    'users.thumb AS user_thumb',
@@ -193,6 +194,7 @@ class Users(object):
 
             row = {'row_id': item['row_id'],
                    'user_id': item['user_id'],
+                   'username': item['username'],
                    'friendly_name': item['friendly_name'],
                    'user_thumb': user_thumb,
                    'plays': item['plays'],
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index c8295e76..866d6501 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -982,12 +982,14 @@ class WebInterface(object):
                     [{"friendly_name": "Jon Snow",
                       "total_plays": 170,
                       "user_id": 133788,
-                      "user_thumb": "https://plex.tv/users/k10w42309cynaopq/avatar"
+                      "user_thumb": "https://plex.tv/users/k10w42309cynaopq/avatar",
+                      "username": "LordCommanderSnow"
                       },
-                     {"platform_type": "DanyKhaleesi69",
+                     {"friendly_name": "DanyKhaleesi69",
                       "total_plays": 42,
                       "user_id": 8008135,
-                      "user_thumb": "https://plex.tv/users/568gwwoib5t98a3a/avatar"
+                      "user_thumb": "https://plex.tv/users/568gwwoib5t98a3a/avatar",
+                      "username: "DanyKhaleesi69"
                       },
                      {...},
                      {...}
@@ -1200,6 +1202,7 @@ class WebInterface(object):
                           "transcode_decision": "transcode",
                           "user_id": 133788,
                           "user_thumb": "https://plex.tv/users/568gwwoib5t98a3a/avatar",
+                          "username": "LordCommanderSnow",
                           "year": 2016
                           },
                          {...},