diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index f4ec84344..961c027e0 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -120,10 +120,12 @@
                     <div class="form-group">
                         <label class="control-label">Groups</label>
                         <div>
-                            <span ng-show="useredit.userInfo.id === userInfo.id">
-                                <button class="btn btn-default btn-primary" type="button" ng-click="showBubble($event)" data-toggle="tooltip" data-trigger="manual" title="Removing yourself from admin group is not allowed">Admin</button>
+                            <span>
+                                <button class="btn btn-default btn-primary" type="button" ng-show="useredit.userInfo.id === userInfo.id" ng-click="showBubble($event)" data-toggle="tooltip" data-trigger="manual" title="Removing yourself from admin group is not allowed">Admin</button>
+                                <button class="btn btn-default btn-primary" type="button" ng-hide="useredit.userInfo.id === userInfo.id" ng-click="userEditToggleGroup({ id: 'admin', name: 'admin' })" ng-class="{ 'btn-primary': (useredit.groupIds.indexOf('admin') !== -1) }">Admin</button>
                             </span>
-                            <span ng-repeat="group in groups" ng-hide="useredit.userInfo.id === userInfo.id && group.id === 'admin'">
+
+                            <span ng-repeat="group in groups" ng-show="group.id !== 'admin'">
                                 <button class="btn btn-default" type="button" ng-click="userEditToggleGroup(group);" ng-class="{ 'btn-primary': (useredit.groupIds.indexOf(group.id) !== -1) }">{{ group.name }}</button>
                             </span>
                         </div>