diff --git a/PlexRequests.Core/ISecurityExtensions.cs b/PlexRequests.Core/ISecurityExtensions.cs
index b343e63f7..cc1b856fd 100644
--- a/PlexRequests.Core/ISecurityExtensions.cs
+++ b/PlexRequests.Core/ISecurityExtensions.cs
@@ -19,5 +19,12 @@ namespace PlexRequests.Core
         bool IsNormalUser(NancyContext context);
         bool IsPlexUser(NancyContext context);
         bool HasPermissions(string userName, Permissions perm);
+
+        /// <summary>
+        /// Gets the username this could be the alias! We should always use this method when getting the username
+        /// </summary>
+        /// <param name="username">The username.</param>
+        /// <returns><c>null</c> if we cannot find a user</returns>
+        string GetUsername(string username);
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Core/SecurityExtensions.cs b/PlexRequests.Core/SecurityExtensions.cs
index 3bb887cbd..bc99d7231 100644
--- a/PlexRequests.Core/SecurityExtensions.cs
+++ b/PlexRequests.Core/SecurityExtensions.cs
@@ -30,6 +30,7 @@ using Nancy;
 using Nancy.Linker;
 using Nancy.Responses;
 using Nancy.Security;
+using PlexRequests.Core.Models;
 using PlexRequests.Helpers;
 using PlexRequests.Helpers.Permissions;
 using PlexRequests.Store.Repository;
@@ -77,6 +78,42 @@ namespace PlexRequests.Core
             return dbUser != null;
         }
 
+        /// <summary>
+        /// Gets the username this could be the alias! We should always use this method when getting the username
+        /// </summary>
+        /// <param name="username">The username.</param>
+        /// <returns><c>null</c> if we cannot find a user</returns>
+        public string GetUsername(string username)
+        {
+            var plexUser = PlexUsers.GetUserByUsername(username);
+            if (plexUser != null)
+            {
+                if (!string.IsNullOrEmpty(plexUser.UserAlias))
+                {
+                    return plexUser.UserAlias;
+                }
+                else
+                {
+                    return plexUser.Username;
+                }
+            }
+
+            var dbUser = UserRepository.GetUserByUsername(username);
+            if (dbUser != null)
+            {
+                var userProps = ByteConverterHelper.ReturnObject<UserProperties>(dbUser.UserProperties);
+                if (!string.IsNullOrEmpty(userProps.UserAlias))
+                {
+                    return userProps.UserAlias;
+                }
+                else
+                {
+                    return dbUser.UserName;
+                }
+            }
+            return null;
+        }
+
 
         /// <summary>
         /// Creates a hook to be used in a pipeline before a route handler to ensure
diff --git a/PlexRequests.UI/Modules/BaseModule.cs b/PlexRequests.UI/Modules/BaseModule.cs
index b8fcb63e4..e0ea40363 100644
--- a/PlexRequests.UI/Modules/BaseModule.cs
+++ b/PlexRequests.UI/Modules/BaseModule.cs
@@ -109,7 +109,12 @@ namespace PlexRequests.UI.Modules
                 {
                     try
                     {
-                        _username = User == null ? Session[SessionKeys.UsernameKey].ToString() : User.UserName;
+                        var username = Security.GetUsername(User.UserName);
+                        if (string.IsNullOrEmpty(username))
+                        {
+                            return Session[SessionKeys.UsernameKey].ToString();
+                        }
+                        _username = username;
                     }
                     catch (Exception)
                     {