diff --git a/src/views/users.html b/src/views/users.html
index 692fbf1ef..74c359bb0 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -312,6 +312,21 @@
                 <input type="text" class="form-control" ng-model="externalLdap.usernameField" id="inputExternalLdapConfigUsernameField" name="usernameField" ng-disabled="externalLdap.busy" placeholder="uid or sAMAcountName">
               </div>
 
+              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.groupBaseDn }">
+                <label class="control-label" for="inputExternalLdapConfigGroupBaseDn">Group Base DN</label>
+                <input type="text" class="form-control" ng-model="externalLdap.groupBaseDn" id="inputExternalLdapConfigGroupBaseDn" name="groupBaseDn" ng-disabled="externalLdap.busy" placeholder="ou=groups,dc=example,dc=com">
+              </div>
+
+              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.groupFilter }">
+                <label class="control-label" for="inputExternalLdapConfigGroupFilter">Group Filter</label>
+                <input type="text" class="form-control" ng-model="externalLdap.groupFilter" id="inputExternalLdapConfigGroupFilter" name="groupFilter" ng-disabled="externalLdap.busy" placeholder="(objectClass=groupOfNames)">
+              </div>
+
+              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.groupnameField }">
+                <label class="control-label" for="inputExternalLdapConfigGroupnameField">Groupname Field (case sensitive)</label>
+                <input type="text" class="form-control" ng-model="externalLdap.groupnameField" id="inputExternalLdapConfigGroupnameField" name="groupnameField" ng-disabled="externalLdap.busy" placeholder="cn">
+              </div>
+
               <div class="form-group" ng-class="{ 'has-error': externalLdap.error.credentials }">
                 <label class="control-label" for="inputExternalLdapConfigBindDn">Bind DN/Username (optional)</label>
                 <input type="text" class="form-control" ng-model="externalLdap.bindDn" id="inputExternalLdapConfigBindDn" name="bindDn" ng-disabled="externalLdap.busy" placeholder="uid=admin,ou=Users,dc=example,dc=com">
@@ -532,6 +547,24 @@
         </div>
       </div>
 
+      <div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
+        <div class="col-xs-6">
+          <span class="text-muted">Group Base DN</span>
+        </div>
+        <div class="col-xs-6 text-right">
+          <span>{{ externalLdap.currentConfig.groupBaseDn }}</span>
+        </div>
+      </div>
+
+      <div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
+        <div class="col-xs-6">
+          <span class="text-muted">Group Filter</span>
+        </div>
+        <div class="col-xs-6 text-right">
+          <span>{{ externalLdap.currentConfig.groupFilter }}</span>
+        </div>
+      </div>
+
       <div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
         <div class="col-xs-6">
           <span class="text-muted">Username Field</span>
diff --git a/src/views/users.js b/src/views/users.js
index 2796f36c7..5e36a299e 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -469,6 +469,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         url: '',
         baseDn: '',
         filter: '',
+        groupBaseDn: '',
         bindDn: '',
         bindPassword: '',
         usernameField: '',
@@ -529,6 +530,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.externalLdap.url = $scope.externalLdap.currentConfig.url;
             $scope.externalLdap.baseDn = $scope.externalLdap.currentConfig.baseDn;
             $scope.externalLdap.filter = $scope.externalLdap.currentConfig.filter;
+            $scope.externalLdap.groupBaseDn = $scope.externalLdap.currentConfig.groupBaseDn;
             $scope.externalLdap.bindDn = $scope.externalLdap.currentConfig.bindDn;
             $scope.externalLdap.bindPassword = $scope.externalLdap.currentConfig.bindPassword;
             $scope.externalLdap.usernameField = $scope.externalLdap.currentConfig.usernameField;
@@ -550,6 +552,9 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                 config.baseDn = $scope.externalLdap.baseDn;
                 config.filter = $scope.externalLdap.filter;
                 config.usernameField = $scope.externalLdap.usernameField;
+                config.groupBaseDn = $scope.externalLdap.groupBaseDn;
+                config.groupFilter = $scope.externalLdap.groupFilter;
+                config.groupnameField = $scope.externalLdap.groupnameField;
                 config.autoCreate = $scope.externalLdap.autoCreate;
 
                 if ($scope.externalLdap.bindDn) {
@@ -569,6 +574,12 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                         $scope.externalLdap.error.baseDn = true;
                     } else if (error.statusCode === 400 && error.message === 'invalid filter') {
                         $scope.externalLdap.error.filter = true;
+                    } else if (error.statusCode === 400 && error.message === 'invalid groupBaseDn') {
+                        $scope.externalLdap.error.groupBaseDn = true;
+                    } else if (error.statusCode === 400 && error.message === 'invalid groupFilter') {
+                        $scope.externalLdap.error.groupFilter = true;
+                    } else if (error.statusCode === 400 && error.message === 'invalid groupnameField') {
+                        $scope.externalLdap.error.groupnameField = true;
                     } else if (error.statusCode === 400 && error.message === 'invalid bind credentials') {
                         $scope.externalLdap.error.credentials = true;
                     }  else if (error.statusCode === 400 && error.message === 'invalid usernameField') {