diff --git a/src/views/users.html b/src/views/users.html
index f40cf3d0e..464971302 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -39,8 +39,8 @@
                     <div class="form-group">
                         <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" data-compare-by="name" data-multiple="true"></multiselect>
+                            <div ng-show="groups.length === 0">No groups available.</div>
+                            <multiselect ng-show="groups.length !== 0" ng-model="useradd.selectedGroups" options="group.name for group in groups" data-compare-by="name" data-multiple="true"></multiselect>
                         </div>
                     </div>
 
@@ -135,8 +135,8 @@
                     <div class="form-group">
                         <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" data-compare-by="name" data-multiple="true"></multiselect>
+                            <div ng-show="groups.length === 0">No groups available.</div>
+                            <multiselect ng-show="groups.length !== 0" 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)">
@@ -203,7 +203,7 @@
                     <div class="form-group">
                         <label class="control-label">Users</label>
                         <div class="control-label">
-                            <multiselect ng-model="groupEdit.selectedUsers" options="user.username for user in users" data-compare-by="username" data-multiple="true"></multiselect>
+                            <multiselect ng-model="groupEdit.selectedUsers" options="(user.username || user.email) for user in users" data-compare-by="email" data-multiple="true"></multiselect>
                         </div>
                     </div>
                     <input class="hide" type="submit" ng-disabled="groupEdit_form.$invalid || useredit.busy"/>