3 files changed, 47 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs
index 167ff2f78..ca08a3290 100644
--- a/MediaBrowser.Controller/Dto/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs
@@ -868,7 +868,7 @@ namespace MediaBrowser.Controller.Dto
                 return GetClientItemId(indexFolder.Parent) + IndexFolderDelimeter + (indexFolder.IndexName ?? string.Empty) + IndexFolderDelimeter + indexFolder.Id;
             }
 
-            return item.Id.ToString();
+            return item.Id.ToString("N");
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Dto/SessionInfoDtoBuilder.cs b/MediaBrowser.Controller/Dto/SessionInfoDtoBuilder.cs
new file mode 100644
index 000000000..850af573f
--- /dev/null
+++ b/MediaBrowser.Controller/Dto/SessionInfoDtoBuilder.cs
@@ -0,0 +1,45 @@
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Session;
+
+namespace MediaBrowser.Controller.Dto
+{
+    /// <summary>
+    /// Class SessionInfoDtoBuilder
+    /// </summary>
+    public static class SessionInfoDtoBuilder
+    {
+        /// <summary>
+        /// Gets the session info dto.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <returns>SessionInfoDto.</returns>
+        public static SessionInfoDto GetSessionInfoDto(SessionInfo session)
+        {
+            var dto = new SessionInfoDto
+            {
+                Client = session.Client,
+                DeviceId = session.DeviceId,
+                DeviceName = session.DeviceName,
+                Id = session.Id,
+                LastActivityDate = session.LastActivityDate,
+                NowPlayingPositionTicks = session.NowPlayingPositionTicks
+            };
+
+            if (session.NowPlayingItem != null)
+            {
+                dto.NowPlayingItem = DtoBuilder.GetBaseItemInfo(session.NowPlayingItem);
+            }
+
+            if (session.UserId.HasValue)
+            {
+                dto.UserId = session.UserId.Value.ToString("N");
+            }
+
+            dto.SupportsRemoteControl = session.WebSocket != null &&
+                                        session.WebSocket.State == WebSocketState.Open;
+
+            return dto;
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/Dto/UserDtoBuilder.cs b/MediaBrowser.Controller/Dto/UserDtoBuilder.cs
index ad90a392c..892bd5dd0 100644
--- a/MediaBrowser.Controller/Dto/UserDtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/UserDtoBuilder.cs
@@ -41,7 +41,7 @@ namespace MediaBrowser.Controller.Dto
 
             var dto = new UserDto
             {
-                Id = user.Id.ToString(),
+                Id = user.Id.ToString("N"),
                 Name = user.Name,
                 HasPassword = !String.IsNullOrEmpty(user.Password),
                 LastActivityDate = user.LastActivityDate,