diff --git a/dashboard/src/translation/en.json b/dashboard/src/translation/en.json
index 61e73f7f1..3021242ed 100644
--- a/dashboard/src/translation/en.json
+++ b/dashboard/src/translation/en.json
@@ -274,7 +274,8 @@
             "activeCheckbox": "User is active",
             "displayNamePlaceholder": "Optional. If not provided, user can provide during sign up",
             "fallbackEmailPlaceholder": "Optional. If not specified, primary email will be used",
-            "external2FA": "2FA setup is managed by external authentication source"
+            "external2FA": "2FA setup is managed by external authentication source",
+            "ldapGroups": "LDAP Groups"
         },
         "deleteUserDialog": {
             "title": "Delete user {{ username }}",
diff --git a/dashboard/src/translation/nl.json b/dashboard/src/translation/nl.json
index 3271d54cc..a6dbfe9d4 100644
--- a/dashboard/src/translation/nl.json
+++ b/dashboard/src/translation/nl.json
@@ -371,7 +371,8 @@
                 "label": "Koppel wachtwoord",
                 "description": "Alle LDAP verzoeken moeten geauthentiseerd worden met dit geheim en de gebruiker DN <i>{{ userDN }}</i>",
                 "url": "Server URL"
-            }
+            },
+            "cloudflarePortWarning": "Cloudflare proxy moet uitgeschakeld zijn op het domein van het dashboard om de LDAP server te kunnen bereiken"
         },
         "userImportDialog": {
             "title": "Importeer gebruikers",
diff --git a/dashboard/src/views/users.html b/dashboard/src/views/users.html
index 7f6086a08..98775bf86 100644
--- a/dashboard/src/views/users.html
+++ b/dashboard/src/views/users.html
@@ -56,7 +56,8 @@
             <label class="control-label">{{ 'users.user.groups' | tr }}</label>
             <div class="control-label">
               <div ng-show="groups.length === 0">{{ 'users.user.noGroups' | tr }}</div>
-              <multiselect ng-show="groups.length !== 0" ng-model="userAdd.selectedLocalGroups" options="group.name for group in groups | filter:{ source: '' }" data-compare-by="name" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
+              <!-- local groups. they can have local and external users . angular cannot filter empty strings - https://github.com/angular/angular.js/issues/7890 -->
+              <multiselect ng-show="groups.length !== 0" ng-model="userAdd.selectedLocalGroups" options="group.name for group in groups | filter:{ source: '!ldap' }" data-compare-by="name" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
             </div>
           </div>
 
@@ -158,14 +159,17 @@
               <div ng-switch on="groups.length">
                 <div ng-switch-when="0">{{ 'users.user.noGroups' | tr }}</div>
                 <div ng-switch-default>
-                  <!-- local groups. they can have local and external users-->
-                  <multiselect ng-show="hasLocalGroups" ng-model="userEdit.selectedLocalGroups" options="group.name for group in groups | filter: { source: '' }" data-compare-by="id" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
-                  <!-- remote groups. cannot be edited -->
-                  <div ng-show="userEdit.externalGroups.length"><br/>LDAP: <span ng-repeat="group in externalGroups">{{ group.name }}</span></div>
+                  <!-- local groups. they can have local and external users . angular cannot filter empty strings - https://github.com/angular/angular.js/issues/7890 -->
+                  <multiselect ng-show="hasLocalGroups" ng-model="userEdit.selectedLocalGroups" options="group.name for group in groups | filter:{ source: '!ldap' }" data-compare-by="id" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
                 </div>
               </div>
             </div>
           </div>
+          <div class="form-group" ng-show="userEdit.externalGroups.length">
+              <!-- remote groups. cannot be edited -->
+              <label class="control-label">{{ 'users.user.ldapGroups' | tr }}</label>
+              <div><span ng-repeat="group in userEdit.externalGroups">{{ group.name }}</span></div>
+          </div>
           <div class="form-group" ng-hide="isMe(userEdit.userInfo)">
             <div class="checkbox">
               <label>
@@ -246,7 +250,7 @@
             <label class="control-label">{{ 'users.group.users' | tr }}</label>
             <div class="control-label">
               <multiselect ng-hide="groupEdit.source" ng-model="groupEdit.selectedUsers" ng-disabled="groupEdit.busy" options="(user.username || user.email) for user in allUsers" data-compare-by="email" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
-              <div ng-show="groupEdit.source"><span ng-repeat="user in selectedUsers"> {{ (user.username || user.email) }}</span></div>
+              <div ng-show="groupEdit.source"><span ng-repeat="user in groupEdit.selectedUsers"> {{ (user.username || user.email) }}</span></div>
             </div>
           </div>
           <div class="form-group">
diff --git a/dashboard/src/views/users.js b/dashboard/src/views/users.js
index 65fa72285..75a6742b5 100644
--- a/dashboard/src/views/users.js
+++ b/dashboard/src/views/users.js
@@ -450,7 +450,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                 }
 
                 refreshUsersCurrentPage(false /* busy indicator */);
-                if (!$scope.config.ldapGroupsSynced) refreshGroups();
+                refreshGroups();
                 $('#userEditModal').modal('hide');
             });
         },