diff --git a/src/js/client.js b/src/js/client.js
index 7b078f31a..b959ab2ea 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -968,7 +968,8 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
         var data = {
             email: user.email,
             displayName: user.displayName,
-            invite: !!user.sendInvite
+            invite: !!user.sendInvite,
+            admin: user.admin
         };
 
         if (user.username !== null) data.username = user.username;
@@ -983,7 +984,8 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
         var data = {
             email: user.email,
             displayName: user.displayName,
-            fallbackEmail: user.fallbackEmail
+            fallbackEmail: user.fallbackEmail,
+            admin: user.admin
         };
 
         post('/api/v1/users/' + user.id, data).success(function(data, status) {
diff --git a/src/js/index.js b/src/js/index.js
index e2da46caf..01a5cc8ef 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -231,15 +231,6 @@ app.filter('inProgressApps', function () {
     };
 });
 
-app.filter('ignoreAdminGroup', function () {
-    return function (groups) {
-        return groups.filter(function (group) {
-            if (group.id) return group.id !== 'admin';
-            return group !== 'admin';
-        });
-    };
-});
-
 app.filter('applicationLink', function() {
     return function(app) {
         if (app.installationState === ISTATES.INSTALLED && app.health === HSTATES.HEALTHY && !app.pendingPostInstallConfirmation) {
diff --git a/src/views/apps.html b/src/views/apps.html
index 721dd7e0e..f514ae50e 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -83,7 +83,7 @@
 
                                             <div class="col-md-5">
                                                 Groups:
-                                                <multiselect class="input-sm stretch" ng-model="appConfigure.accessRestriction.groups" ng-disabled="appConfigure.accessRestrictionOption !== 'groups'" options="group.name for group in (groups | ignoreAdminGroup)" data-multiple="true"></multiselect>
+                                                <multiselect class="input-sm stretch" ng-model="appConfigure.accessRestriction.groups" ng-disabled="appConfigure.accessRestrictionOption !== 'groups'" options="group.name for group in groups" data-multiple="true"></multiselect>
                                             </div>
                                         </div>
                                     </div>
diff --git a/src/views/appstore.html b/src/views/appstore.html
index 45893081d..e7d64ea9f 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -93,7 +93,7 @@
 
                                     <div class="col-md-5">
                                         Groups: &nbsp;
-                                        <multiselect ng-model="appInstall.accessRestriction.groups" ng-disabled="appInstall.accessRestrictionOption !== 'groups'" options="group.name for group in (groups | ignoreAdminGroup)" data-multiple="true"></multiselect>
+                                        <multiselect ng-model="appInstall.accessRestriction.groups" ng-disabled="appInstall.accessRestrictionOption !== 'groups'" options="group.name for group in groups" data-multiple="true"></multiselect>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/views/users.html b/src/views/users.html
index 8c8e9b9b1..f40cf3d0e 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -40,14 +40,14 @@
                         <label class="control-label">Groups</label>
                         <div class="control-label">
                             <div ng-show="groups.length <= 1">No groups available.</div>
-                            <multiselect ng-show="groups.length > 1" ng-model="useradd.selectedGroups" options="group.name for group in groups | ignoreAdminGroup" data-compare-by="name" data-multiple="true"></multiselect>
+                            <multiselect ng-show="groups.length > 1" ng-model="useradd.selectedGroups" options="group.name for group in groups" data-compare-by="name" data-multiple="true"></multiselect>
                         </div>
                     </div>
 
                     <div class="form-group">
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" ng-model="useradd.superuser"> User is an <a href="https://cloudron.io/documentation/user-management/#administrators" target="_blank">administrator</a>
+                                <input type="checkbox" ng-model="useradd.admin"> User is an <a href="https://cloudron.io/documentation/user-management/#administrators" target="_blank">administrator</a>
                             </label>
                         </div>
                     </div>
@@ -136,13 +136,13 @@
                         <label class="control-label">Groups</label>
                         <div class="control-label">
                             <div ng-show="groups.length <= 1">No groups available.</div>
-                            <multiselect ng-show="groups.length > 1" ng-model="useredit.selectedGroups" options="group.name for group in groups | ignoreAdminGroup" data-compare-by="name" data-multiple="true"></multiselect>
+                            <multiselect ng-show="groups.length > 1" ng-model="useredit.selectedGroups" options="group.name for group in groups" data-compare-by="name" data-multiple="true"></multiselect>
                         </div>
                     </div>
                     <div class="form-group" ng-hide="isMe(useredit.userInfo)">
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" ng-model="useredit.superuser"> User is an <a href="https://cloudron.io/documentation/user-management/#administrators" target="_blank">administrator</a>
+                                <input type="checkbox" ng-model="useredit.admin"> User is an <a href="https://cloudron.io/documentation/user-management/#administrators" target="_blank">administrator</a>
                             </label>
                         </div>
                     </div>
@@ -318,7 +318,7 @@
                                   <span class="text-muted" uib-tooltip="User is not activated yet">{{ user.fallbackEmail }}</span>
                               </td>
                               <td class="text-left hand elide-table-cell hidden-xs hidden-sm" ng-click="useredit.show(user)">
-                                  <span class="group-badge" ng-repeat="groupId in user.groupIds | ignoreAdminGroup">
+                                  <span class="group-badge" ng-repeat="groupId in user.groupIds">
                                       {{ groupsById[groupId].name }}
                                   </span>
                               </td>
@@ -363,7 +363,7 @@
                           </tr>
                       </thead>
                       <tbody>
-                          <tr ng-repeat="group in groups | ignoreAdminGroup">
+                          <tr ng-repeat="group in groups">
                               <td class="hand elide-table-cell" style="text-overflow: ellipsis; white-space: nowrap;" ng-click="groupEdit.show(group)">
                                   {{ group.name }}
                               </td>
diff --git a/src/views/users.js b/src/views/users.js
index be77fa3b6..ad068efd9 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -76,7 +76,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         displayName: '',
         sendInvite: true,
         selectedGroups: [],
-        superuser: false,
+        admin: false,
 
         show: function () {
             $scope.useradd.error = {};
@@ -84,7 +84,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.useradd.username = '';
             $scope.useradd.displayName = '';
             $scope.useradd.selectedGroups = [];
-            $scope.useradd.superuser = false;
+            $scope.useradd.admin = false;
 
             $scope.useradd_form.$setUntouched();
             $scope.useradd_form.$setPristine();
@@ -104,7 +104,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                 username: $scope.useradd.username || null,
                 email: $scope.useradd.email,
                 displayName: $scope.useradd.displayName,
-                sendInvite: $scope.useradd.sendInvite
+                sendInvite: $scope.useradd.sendInvite,
+                admin: $scope.useradd.admin
             };
 
             Client.createUser(user, function (error, newUserInfo) {
@@ -146,12 +147,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
                 var groupIds = $scope.useradd.selectedGroups.map(function (g) { return g.id; });
 
-                if ($scope.useradd.superuser) {
-                    if (groupIds.indexOf('admin') === -1) groupIds.push('admin');
-                } else {
-                    groupIds = groupIds.filter(function (groupId) { return groupId !== 'admin'; });
-                }
-
                 Client.setGroups(newUserInfo.id, groupIds, function (error) {
                     $scope.useradd.busy = false;
 
@@ -173,7 +168,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         fallbackEmail: '',
         aliases: {},
         displayName: '',
-        superuser: false,
+        admin: false,
         selectedGroups: [],
 
         show: function (userInfo) {
@@ -183,7 +178,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.useredit.fallbackEmail = userInfo.fallbackEmail;
             $scope.useredit.userInfo = userInfo;
             $scope.useredit.selectedGroups = userInfo.groupIds.map(function (gid) { return $scope.groupsById[gid]; });
-            $scope.useredit.superuser = userInfo.groupIds.indexOf('admin') !== -1;
+            $scope.useredit.admin = userInfo.admin;
 
             $scope.useredit_form.$setPristine();
             $scope.useredit_form.$setUntouched();
@@ -200,7 +195,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                 id: userId,
                 email: $scope.useredit.email,
                 displayName: $scope.useredit.displayName,
-                fallbackEmail: $scope.useredit.fallbackEmail
+                fallbackEmail: $scope.useredit.fallbackEmail,
+                admin: $scope.useredit.admin
             };
 
             Client.updateUser(data, function (error) {
@@ -220,12 +216,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
                 var groupIds = $scope.useredit.selectedGroups.map(function (g) { return g.id; });
 
-                if ($scope.useredit.superuser) {
-                    if (groupIds.indexOf('admin') === -1) groupIds.push('admin');
-                } else {
-                    groupIds = groupIds.filter(function (groupId) { return groupId !== 'admin'; });
-                }
-
                 Client.setGroups(data.id, groupIds, function (error) {
                     $scope.useredit.busy = false;