fixes for new user settings

1 files changed, 9 insertions, 2 deletions

diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index b63bafbc0..8eb55c786 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -197,7 +197,8 @@ namespace MediaBrowser.Api
         {
             return Get(new GetUsers
             {
-                IsHidden = false
+                IsHidden = false,
+                IsDisabled = false
             });
         }
 
@@ -367,7 +368,13 @@ namespace MediaBrowser.Api
                 }
             }
 
-            // If removing admin access
+            // If disabling
+            if (dtoUser.Configuration.IsDisabled && user.Configuration.IsAdministrator)
+            {
+                throw new ArgumentException("Administrators cannot be disabled.");
+            }
+
+            // If disabling
             if (dtoUser.Configuration.IsDisabled && !user.Configuration.IsDisabled)
             {
                 if (_userManager.Users.Count(i => !i.Configuration.IsDisabled) == 1)