diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index e759d4dd3..91701b201 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -125,7 +125,7 @@
                         <div class="form-group">
                             <label class="control-label" for="inputUserEditGroups">Groups</label>
                             <div>
-                                <button class="btn btn-default" data-toggle="button" ng-repeat="group in groups" ng-click="userEditToggleGroup(group);">{{ group.name }}</button>
+                                <button class="btn btn-default" type="button" ng-repeat="group in groups" ng-click="userEditToggleGroup(group);" ng-class="{ 'btn-primary': (useredit.groupIds.indexOf(group.id) !== -1) }">{{ group.name }}</button>
                             </div>
                         </div>
                         <div class="form-group" ng-class="{ 'has-error': (useredit_form.password.$dirty && useredit_form.password.$invalid) || (!useredit_form.password.$dirty && useredit.error.password)}">
diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js
index 5b848551c..dec9f21b7 100644
--- a/webadmin/src/views/users.js
+++ b/webadmin/src/views/users.js
@@ -135,7 +135,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         $scope.useredit.displayName = userInfo.displayName;
         $scope.useredit.email = userInfo.email;
         $scope.useredit.userInfo = userInfo;
-        $scope.useredit.groups = userInfo.groupIds;
+        $scope.useredit.groupIds = angular.copy(userInfo.groupIds);
 
         $scope.useredit_form.$setPristine();
         $scope.useredit_form.$setUntouched();
@@ -143,6 +143,15 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         $('#userEditModal').modal('show');
     };
 
+    $scope.userEditToggleGroup = function (group) {
+        var pos = $scope.useredit.groupIds.indexOf(group.id);
+        if (pos === -1) {
+            $scope.useredit.groupIds.push(group.id);
+        } else {
+            $scope.useredit.groupIds.splice(pos, 1);
+        }
+    };
+
     $scope.doUserEdit = function () {
         $scope.useredit.error.displayName = null;
         $scope.useredit.error.email = null;