diff --git a/src/views/users.html b/src/views/users.html
index 0b17771be..c654e5236 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -312,19 +312,27 @@
                 <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 }">
+              <div class="form-group">
+                <div class="checkbox">
+                  <label>
+                    <input type="checkbox" ng-model="externalLdap.syncGroups"> Sync Groups</sup>
+                  </label>
+                </div>
+              </div>
+
+              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.groupBaseDn }" ng-show="externalLdap.syncGroups">
                 <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">
+                <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" ng-required="externalLdap.syncGroups">
               </div>
 
-              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.groupFilter }">
+              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.groupFilter }" ng-show="externalLdap.syncGroups">
                 <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)">
+                <input type="text" class="form-control" ng-model="externalLdap.groupFilter" id="inputExternalLdapConfigGroupFilter" name="groupFilter" ng-disabled="externalLdap.busy" placeholder="(objectClass=groupOfNames)" ng-required="externalLdap.syncGroups">
               </div>
 
-              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.groupnameField }">
+              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.groupnameField }" ng-show="externalLdap.syncGroups">
                 <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">
+                <input type="text" class="form-control" ng-model="externalLdap.groupnameField" id="inputExternalLdapConfigGroupnameField" name="groupnameField" ng-disabled="externalLdap.busy" placeholder="cn" ng-required="externalLdap.syncGroups">
               </div>
 
               <div class="form-group" ng-class="{ 'has-error': externalLdap.error.credentials }">
@@ -548,6 +556,24 @@
       </div>
 
       <div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
+        <div class="col-xs-6">
+          <span class="text-muted">Username Field</span>
+        </div>
+        <div class="col-xs-6 text-right">
+          <span>{{ externalLdap.currentConfig.usernameField || 'uid' }}</span>
+        </div>
+      </div>
+
+      <div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
+        <div class="col-xs-6">
+          <span class="text-muted">Sync Groups</span>
+        </div>
+        <div class="col-xs-6 text-right">
+          <span>{{ externalLdap.currentConfig.syncGroups ? 'Yes' : 'No' }}</span>
+        </div>
+      </div>
+
+      <div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop' && externalLdap.currentConfig.syncGroups">
         <div class="col-xs-6">
           <span class="text-muted">Group Base DN</span>
         </div>
@@ -556,7 +582,7 @@
         </div>
       </div>
 
-      <div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
+      <div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop' && externalLdap.currentConfig.syncGroups">
         <div class="col-xs-6">
           <span class="text-muted">Group Filter</span>
         </div>
@@ -565,12 +591,12 @@
         </div>
       </div>
 
-      <div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
+      <div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop' && externalLdap.currentConfig.syncGroups">
         <div class="col-xs-6">
-          <span class="text-muted">Username Field</span>
+          <span class="text-muted">Groupname Field</span>
         </div>
         <div class="col-xs-6 text-right">
-          <span>{{ externalLdap.currentConfig.usernameField || 'uid' }}</span>
+          <span>{{ externalLdap.currentConfig.groupnameField }}</span>
         </div>
       </div>
 
diff --git a/src/views/users.js b/src/views/users.js
index b93b09a7b..0608fedac 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -530,6 +530,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.externalLdap.baseDn = $scope.externalLdap.currentConfig.baseDn;
             $scope.externalLdap.filter = $scope.externalLdap.currentConfig.filter;
             $scope.externalLdap.groupBaseDn = $scope.externalLdap.currentConfig.groupBaseDn;
+            $scope.externalLdap.syncGroups = $scope.externalLdap.currentConfig.syncGroups;
             $scope.externalLdap.bindDn = $scope.externalLdap.currentConfig.bindDn;
             $scope.externalLdap.bindPassword = $scope.externalLdap.currentConfig.bindPassword;
             $scope.externalLdap.usernameField = $scope.externalLdap.currentConfig.usernameField;
@@ -551,6 +552,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                 config.baseDn = $scope.externalLdap.baseDn;
                 config.filter = $scope.externalLdap.filter;
                 config.usernameField = $scope.externalLdap.usernameField;
+                config.syncGroups = $scope.externalLdap.syncGroups;
                 config.groupBaseDn = $scope.externalLdap.groupBaseDn;
                 config.groupFilter = $scope.externalLdap.groupFilter;
                 config.groupnameField = $scope.externalLdap.groupnameField;