diff --git a/MediaBrowser.Api/ConnectService.cs b/MediaBrowser.Api/ConnectService.cs
index e2a1b98e92..14b04a0bb8 100644
--- a/MediaBrowser.Api/ConnectService.cs
+++ b/MediaBrowser.Api/ConnectService.cs
@@ -5,15 +5,8 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Api
 {
-    [Route("/Users/{Id}/Connect/Info", "GET", Summary = "Gets connect info for a user")]
-    public class GetConnectUserInfo : IReturn<ConnectUserLink>
-    {
-        [ApiMember(Name = "Id", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public string Id { get; set; }
-    }
-
     [Route("/Users/{Id}/Connect/Link", "POST", Summary = "Creates a Connect link for a user")]
-    public class CreateConnectLink : IReturn<ConnectUserLink>
+    public class CreateConnectLink : IReturnVoid
     {
         [ApiMember(Name = "Id", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
         public string Id { get; set; }
@@ -39,13 +32,6 @@ namespace MediaBrowser.Api
             _connectManager = connectManager;
         }
 
-        public object Get(GetConnectUserInfo request)
-        {
-            var result = _connectManager.GetUserInfo(request.Id);
-
-            return ToOptimizedResult(result);
-        }
-
         public void Post(CreateConnectLink request)
         {
             var task = _connectManager.LinkUser(request.Id, request.ConnectUsername);
diff --git a/MediaBrowser.Controller/Connect/ConnectUserLink.cs b/MediaBrowser.Controller/Connect/ConnectUserLink.cs
deleted file mode 100644
index 93de6d8b4e..0000000000
--- a/MediaBrowser.Controller/Connect/ConnectUserLink.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-
-namespace MediaBrowser.Controller.Connect
-{
-    public class ConnectUserLink
-    {
-        public string Username { get; set; }
-        public string UserId { get; set; }
-        public string LocalUserId { get; set; }
-    }
-}
diff --git a/MediaBrowser.Controller/Connect/IConnectManager.cs b/MediaBrowser.Controller/Connect/IConnectManager.cs
index 6c2128cd3f..8bdb76ea41 100644
--- a/MediaBrowser.Controller/Connect/IConnectManager.cs
+++ b/MediaBrowser.Controller/Connect/IConnectManager.cs
@@ -10,13 +10,6 @@ namespace MediaBrowser.Controller.Connect
         /// <value>The wan API address.</value>
         string WanApiAddress { get; }
 
-        /// <summary>
-        /// Gets the user information.
-        /// </summary>
-        /// <param name="userId">The user identifier.</param>
-        /// <returns>ConnectUserInfo.</returns>
-        ConnectUserLink GetUserInfo(string userId);
-
         /// <summary>
         /// Links the user.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index c0c7a6c531..e0682c9ee9 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Connect;
 using MediaBrowser.Model.Serialization;
 using System;
 using System.IO;
@@ -34,6 +35,7 @@ namespace MediaBrowser.Controller.Entities
 
         public string ConnectUserName { get; set; }
         public string ConnectUserId { get; set; }
+        public UserLinkType ConnectLinkType { get; set; }
         public string ConnectAccessKey { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 1d23a82a9e..fa10642324 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -101,7 +101,6 @@
     <Compile Include="Collections\ICollectionManager.cs" />
     <Compile Include="Connect\ConnectInvitationRequest.cs" />
     <Compile Include="Connect\ConnectUser.cs" />
-    <Compile Include="Connect\ConnectUserLink.cs" />
     <Compile Include="Connect\IConnectManager.cs" />
     <Compile Include="Dlna\ControlRequest.cs" />
     <Compile Include="Dlna\ControlResponse.cs" />
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index c6e8adb166..32054beb37 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -188,6 +188,9 @@
     <Compile Include="..\MediaBrowser.Model\Configuration\XbmcMetadataOptions.cs">
       <Link>Configuration\XbmcMetadataOptions.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Connect\UserLinkType.cs">
+      <Link>Connect\UserLinkType.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dlna\AudioOptions.cs">
       <Link>Dlna\AudioOptions.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index 715331436c..e9153117be 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -151,6 +151,9 @@
     <Compile Include="..\MediaBrowser.Model\Configuration\XbmcMetadataOptions.cs">
       <Link>Configuration\XbmcMetadataOptions.cs</Link>
     </Compile>
+    <Compile Include="..\mediabrowser.model\connect\UserLinkType.cs">
+      <Link>Connect\UserLinkType.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dlna\AudioOptions.cs">
       <Link>Dlna\AudioOptions.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/Connect/UserLinkType.cs b/MediaBrowser.Model/Connect/UserLinkType.cs
new file mode 100644
index 0000000000..e8ea15a4e7
--- /dev/null
+++ b/MediaBrowser.Model/Connect/UserLinkType.cs
@@ -0,0 +1,15 @@
+
+namespace MediaBrowser.Model.Connect
+{
+    public enum UserLinkType
+    {
+        /// <summary>
+        /// The linked user
+        /// </summary>
+        LinkedUser = 1,
+        /// <summary>
+        /// The guest
+        /// </summary>
+        Guest = 2
+    }
+}
diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs
index 787f55ec09..b88e9d411a 100644
--- a/MediaBrowser.Model/Dto/UserDto.cs
+++ b/MediaBrowser.Model/Dto/UserDto.cs
@@ -1,9 +1,10 @@
 using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Connect;
+using MediaBrowser.Model.Extensions;
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.Serialization;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dto
 {
@@ -19,6 +20,22 @@ namespace MediaBrowser.Model.Dto
         /// <value>The name.</value>
         public string Name { get; set; }
 
+        /// <summary>
+        /// Gets or sets the name of the connect user.
+        /// </summary>
+        /// <value>The name of the connect user.</value>
+        public string ConnectUserName { get; set; }
+        /// <summary>
+        /// Gets or sets the connect user identifier.
+        /// </summary>
+        /// <value>The connect user identifier.</value>
+        public string ConnectUserId { get; set; }
+        /// <summary>
+        /// Gets or sets the type of the connect link.
+        /// </summary>
+        /// <value>The type of the connect link.</value>
+        public UserLinkType ConnectLinkType { get; set; }
+        
         /// <summary>
         /// Gets or sets the id.
         /// </summary>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 9223db80a2..c4da280e23 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -81,6 +81,7 @@
     <Compile Include="Configuration\ChapterOptions.cs" />
     <Compile Include="Configuration\XbmcMetadataOptions.cs" />
     <Compile Include="Configuration\SubtitlePlaybackMode.cs" />
+    <Compile Include="Connect\UserLinkType.cs" />
     <Compile Include="Drawing\ImageOrientation.cs" />
     <Compile Include="Dto\StreamOptions.cs" />
     <Compile Include="FileOrganization\AutoOrganizeOptions.cs" />
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index 6a1c3f0746..3933b180e2 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -261,18 +261,6 @@ namespace MediaBrowser.Server.Implementations.Connect
             return user;
         }
 
-        public ConnectUserLink GetUserInfo(string userId)
-        {
-            var user = GetUser(userId);
-
-            return new ConnectUserLink
-            {
-                LocalUserId = user.Id.ToString("N"),
-                Username = user.ConnectUserName,
-                UserId = user.ConnectUserId
-            };
-        }
-
         private string GetConnectUrl(string handler)
         {
             return "https://connect.mediabrowser.tv/service/" + handler;
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 47d6b17f0c..16a1dc516b 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -86,7 +86,7 @@ namespace MediaBrowser.Server.Implementations.Library
         /// </summary>
         public event EventHandler<GenericEventArgs<User>> UserUpdated;
         public event EventHandler<GenericEventArgs<User>> UserConfigurationUpdated;
-        
+
         /// <summary>
         /// Called when [user updated].
         /// </summary>
@@ -137,7 +137,7 @@ namespace MediaBrowser.Server.Implementations.Library
         {
             return GetUserById(new Guid(id));
         }
-        
+
         public async Task Initialize()
         {
             Users = await LoadUsers().ConfigureAwait(false);
@@ -260,7 +260,10 @@ namespace MediaBrowser.Server.Implementations.Library
                 HasConfiguredPassword = hasConfiguredDefaultPassword,
                 LastActivityDate = user.LastActivityDate,
                 LastLoginDate = user.LastLoginDate,
-                Configuration = user.Configuration
+                Configuration = user.Configuration,
+                ConnectLinkType = user.ConnectLinkType,
+                ConnectUserId = user.ConnectUserId,
+                ConnectUserName = user.ConnectUserName
             };
 
             var image = user.GetImageInfo(ImageType.Primary, 0);