diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 91493cf53c..c1ab9ec222 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -775,7 +775,14 @@ namespace Emby.Server.Implementations
             }
 
             // Put the app config in the log for troubleshooting purposes
-            Logger.LogMultiline("Application configuration:", LogSeverity.Info, new StringBuilder(JsonSerializer.SerializeToString(ConfigurationManager.CommonConfiguration)));
+            var configJson = new StringBuilder(JsonSerializer.SerializeToString(ConfigurationManager.CommonConfiguration));
+
+            if (!string.IsNullOrWhiteSpace(ServerConfigurationManager.Configuration.CertificatePassword))
+            {
+                configJson = configJson.Replace(ServerConfigurationManager.Configuration.CertificatePassword, "####");
+            }
+
+            Logger.LogMultiline("Application configuration:", LogSeverity.Info, configJson);
 
             if (Plugins != null)
             {
diff --git a/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs b/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
index c9d5ed0071..a41c51d1a8 100644
--- a/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using MediaBrowser.Model.Services;
 using System.Linq;
+using System.Threading;
 
 namespace Emby.Server.Implementations.HttpServer.Security
 {
@@ -95,23 +96,44 @@ namespace Emby.Server.Implementations.HttpServer.Security
                 {
                     info.UserId = tokenInfo.UserId;
 
+                    var updateToken = false;
+
                     // TODO: Remove these checks for IsNullOrWhiteSpace
                     if (string.IsNullOrWhiteSpace(info.Client))
                     {
                         info.Client = tokenInfo.AppName;
                     }
+
+                    if (string.IsNullOrWhiteSpace(info.DeviceId))
+                    {
+                        info.DeviceId = tokenInfo.DeviceId;
+                    }
+
+
                     if (string.IsNullOrWhiteSpace(info.Device))
                     {
                         info.Device = tokenInfo.DeviceName;
                     }
-                    if (string.IsNullOrWhiteSpace(info.DeviceId))
+                    else if (!string.Equals(info.Device, tokenInfo.DeviceName, StringComparison.OrdinalIgnoreCase))
                     {
-                        info.DeviceId = tokenInfo.DeviceId;
+                        updateToken = true;
+                        tokenInfo.DeviceName = info.Device;
                     }
+
                     if (string.IsNullOrWhiteSpace(info.Version))
                     {
                         info.Version = tokenInfo.AppVersion;
                     }
+                    else if (!string.Equals(info.Version, tokenInfo.AppVersion, StringComparison.OrdinalIgnoreCase))
+                    {
+                        updateToken = true;
+                        tokenInfo.AppVersion = info.Version;
+                    }
+
+                    if (updateToken)
+                    {
+                        _authRepo.Update(tokenInfo, CancellationToken.None);
+                    }
                 }
                 else
                 {
diff --git a/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs b/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
index dd5d64bf65..9826a0d564 100644
--- a/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
@@ -25,15 +25,6 @@ namespace Emby.Server.Implementations.HttpServer.Security
         {
             var authorization = _authContext.GetAuthorizationInfo(requestContext);
 
-            //if (!string.IsNullOrWhiteSpace(authorization.Token))
-            //{
-            //    var auth = GetTokenInfo(requestContext);
-            //    if (auth != null)
-            //    {
-            //        return _sessionManager.GetSessionByAuthenticationToken(auth, authorization.DeviceId, requestContext.RemoteIp, authorization.Version);
-            //    }
-            //}
-
             var user = string.IsNullOrWhiteSpace(authorization.UserId) ? null : _userManager.GetUserById(authorization.UserId);
             return _sessionManager.LogSessionActivity(authorization.Client, authorization.Version, authorization.DeviceId, authorization.Device, requestContext.RemoteIp, user);
         }
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 6af624ee6e..92ae176b85 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.33.11")]
+[assembly: AssemblyVersion("3.2.33.12")]