diff --git a/src/views/users.html b/src/views/users.html
index f40b44fb9..88ce5ec06 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -36,7 +36,7 @@
                         <input type="text" class="form-control" ng-model="useradd.username" name="username" id="inputUserAddUsername" placeholder="Optional. If not provided, user can pick during sign up">
                     </div>
 
-                    <div class="form-group" ng-show="userInfo.isAtLeastOwner">
+                    <div class="form-group" ng-show="userInfo.isAtLeastAdmin">
                       <label class="control-label">Role <sup><a ng-href="{{ config.webServerOrigin }}/documentation/user-management/#roles" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
                       <div class="control-label">
                         <select class="form-control" ng-model="useradd.role" ng-options="role.id as role.name disable when role.disabled for role in roles"></select>
@@ -127,7 +127,7 @@
             </div>
             <input type="fallbackEmail" class="form-control" ng-model="useredit.fallbackEmail" name="fallbackEmail" required>
           </div>
-          <div class="form-group" ng-show="!isMe(useredit.userInfo) && userInfo.isAtLeastOwner">
+          <div class="form-group" ng-show="!isMe(useredit.userInfo) && userInfo.isAtLeastAdmin">
             <label class="control-label">Role <sup><a ng-href="{{ config.webServerOrigin }}/documentation/user-management/#roles" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
             <div class="control-label">
               <select class="form-control" ng-model="useredit.role" ng-options="role.id as role.name disable when role.disabled for role in roles"></select>
diff --git a/src/views/users.js b/src/views/users.js
index e3d7fae83..466b4f395 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -690,15 +690,12 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
     Client.onReady(function () { if ($scope.user.isAtLeastAdmin) loadExternalLdapConfig(); });
     Client.onReady(refreshAllUsers);
     Client.onReady(function () {
-        // Update available roles depending on features
-        if ($scope.config.features.userMaxCount === null) {
-            $scope.roles = [
-                { id: 'user', name: 'User', disabled: false },
-                { id: 'usermanager', name: 'User Manager', disabled: false },
-                { id: 'admin', name: 'Administrator', disabled: false },
-                { id: 'owner', name: 'Owner', disabled: false }
-            ];
-        }
+        $scope.roles = [
+            { id: 'user', name: 'User', disabled: false },
+            { id: 'usermanager', name: 'User Manager', disabled: false },
+            { id: 'admin', name: 'Administrator', disabled: !$scope.user.isAtLeastAdmin },
+            { id: 'owner', name: 'Owner', disabled: !$scope.user.isAtLeastOwner }
+        ];
     });
 
     // setup all the dialog focus handling