2 files changed, 7 insertions, 7 deletions

diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 6c1768fd8e..29ce2698c3 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -185,7 +185,7 @@ namespace MediaBrowser.Server.Implementations.Session
 
             connection.DeviceName = deviceName;
 
-            connection.UserId = user == null ? (Guid?)null : user.Id;
+            connection.User = user;
 
             return connection;
         }
diff --git a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
index 532436c079..c649fd4747 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -99,18 +99,18 @@ namespace MediaBrowser.Server.Implementations.Session
             {
                 var session = _sessionManager.Sessions.FirstOrDefault(i => i.WebSockets.Contains(message.Connection));
 
-                if (session != null && session.UserId.HasValue)
+                if (session != null && session.User != null)
                 {
                     var item = DtoBuilder.GetItemByClientId(message.Data, _userManager, _libraryManager);
 
-                    _sessionManager.OnPlaybackStart(_userManager.GetUserById(session.UserId.Value), item, session.Client, session.DeviceId, session.DeviceName);
+                    _sessionManager.OnPlaybackStart(_userManager.GetUserById(session.User.Id), item, session.Client, session.DeviceId, session.DeviceName);
                 }
             }
             else if (string.Equals(message.MessageType, "PlaybackProgress", StringComparison.OrdinalIgnoreCase))
             {
                 var session = _sessionManager.Sessions.FirstOrDefault(i => i.WebSockets.Contains(message.Connection));
 
-                if (session != null && session.UserId.HasValue)
+                if (session != null && session.User != null)
                 {
                     var vals = message.Data.Split('|');
 
@@ -130,14 +130,14 @@ namespace MediaBrowser.Server.Implementations.Session
 
                     var isPaused = vals.Length > 2 && string.Equals(vals[2], "true", StringComparison.OrdinalIgnoreCase);
 
-                    _sessionManager.OnPlaybackProgress(_userManager.GetUserById(session.UserId.Value), item, positionTicks, isPaused, session.Client, session.DeviceId, session.DeviceName);
+                    _sessionManager.OnPlaybackProgress(_userManager.GetUserById(session.User.Id), item, positionTicks, isPaused, session.Client, session.DeviceId, session.DeviceName);
                 }
             }
             else if (string.Equals(message.MessageType, "PlaybackStopped", StringComparison.OrdinalIgnoreCase))
             {
                 var session = _sessionManager.Sessions.FirstOrDefault(i => i.WebSockets.Contains(message.Connection));
 
-                if (session != null && session.UserId.HasValue)
+                if (session != null && session.User != null)
                 {
                     var vals = message.Data.Split('|');
 
@@ -155,7 +155,7 @@ namespace MediaBrowser.Server.Implementations.Session
                         }
                     }
 
-                    _sessionManager.OnPlaybackStopped(_userManager.GetUserById(session.UserId.Value), item, positionTicks, session.Client, session.DeviceId, session.DeviceName);
+                    _sessionManager.OnPlaybackStopped(_userManager.GetUserById(session.User.Id), item, positionTicks, session.Client, session.DeviceId, session.DeviceName);
                 }
             }