2 files changed, 8 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index d0de64a6f..6a1c3f074 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -291,6 +291,11 @@ namespace MediaBrowser.Server.Implementations.Connect
 
             }, CancellationToken.None).ConfigureAwait(false);
 
+            if (!connectUser.IsActive)
+            {
+                throw new ArgumentException("The Media Browser account has been disabled.");
+            }
+
             var user = GetUser(userId);
 
             if (!string.IsNullOrWhiteSpace(user.ConnectUserId))
@@ -422,7 +427,8 @@ namespace MediaBrowser.Server.Implementations.Connect
                 {
                     Email = response.Email,
                     Id = response.Id,
-                    Name = response.Name
+                    Name = response.Name,
+                    IsActive = response.IsActive
                 };
             }
         }
diff --git a/MediaBrowser.Server.Implementations/Connect/Responses.cs b/MediaBrowser.Server.Implementations/Connect/Responses.cs
index 7a80015d5..a3b0369ba 100644
--- a/MediaBrowser.Server.Implementations/Connect/Responses.cs
+++ b/MediaBrowser.Server.Implementations/Connect/Responses.cs
@@ -22,7 +22,7 @@ namespace MediaBrowser.Server.Implementations.Connect
         public string Name { get; set; }
         public string DisplayName { get; set; }
         public string Email { get; set; }
-        public string IsActive { get; set; }
+        public bool IsActive { get; set; }
         public string ImageUrl { get; set; }
     }