diff --git a/src/views/users.html b/src/views/users.html
index 0c84c0f6d..e04390e66 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -282,13 +282,12 @@
         <h4 class="modal-title">Configure LDAP</h4>
       </div>
       <div class="modal-body">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" ng-model="externalLdap.enabled">Enable LDAP</input>
-          </label>
+        <div class="form-group">
+          <label class="control-label" for="ldapProvider">LDAP provider <sup><a ng-href="{{ config.webServerOrigin }}/documentation/user-management/#external-ldap" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+          <select class="form-control" id="ldapProvider" ng-model="externalLdap.provider" ng-options="a.value as a.name for a in ldapProvider"></select>
         </div>
 
-        <div>
+        <div uib-collapse="externalLdap.provider === 'noop'">
           <form name="externalLdapConfigForm" role="form" novalidate ng-submit="externalLdap.submit()" autocomplete="off">
             <fieldset>
               <p class="has-error text-center" ng-show="externalLdap.error.generic">{{ externalLdap.error.generic }}</p>
@@ -298,27 +297,27 @@
 
               <div class="form-group" ng-class="{ 'has-error': externalLdap.error.url }">
                 <label class="control-label" for="inputExternalLdapConfigUrl">Server Url</label>
-                <input type="text" class="form-control" ng-disabled="!externalLdap.enabled" ng-model="externalLdap.url" id="inputExternalLdapConfigUrl" name="url" ng-disabled="externalLdap.busy" placeholder="ldaps://example.com:636" required>
+                <input type="text" class="form-control" ng-model="externalLdap.url" id="inputExternalLdapConfigUrl" name="url" ng-disabled="externalLdap.busy" placeholder="ldaps://example.com:636" required>
               </div>
 
               <div class="form-group" ng-class="{ 'has-error': externalLdap.error.baseDn }">
                 <label class="control-label" for="inputExternalLdapConfigBaseDn">Base DN</label>
-                <input type="text" class="form-control" ng-disabled="!externalLdap.enabled" ng-model="externalLdap.baseDn" id="inputExternalLdapConfigBaseDn" name="baseDn" ng-disabled="externalLdap.busy" placeholder="ou=users,dc=example,dc=com" required>
+                <input type="text" class="form-control" ng-model="externalLdap.baseDn" id="inputExternalLdapConfigBaseDn" name="baseDn" ng-disabled="externalLdap.busy" placeholder="ou=users,dc=example,dc=com" required>
               </div>
 
               <div class="form-group" ng-class="{ 'has-error': externalLdap.error.filter }">
                 <label class="control-label" for="inputExternalLdapConfigFilter">Filter</label>
-                <input type="text" class="form-control" ng-disabled="!externalLdap.enabled" ng-model="externalLdap.filter" id="inputExternalLdapConfigFilter" name="filter" ng-disabled="externalLdap.busy" placeholder="(objectClass=inetOrgPerson)" required>
+                <input type="text" class="form-control" ng-model="externalLdap.filter" id="inputExternalLdapConfigFilter" name="filter" ng-disabled="externalLdap.busy" placeholder="(objectClass=inetOrgPerson)" required>
               </div>
 
               <div class="form-group" ng-class="{ 'has-error': externalLdap.error.credentials }">
                 <label class="control-label" for="inputExternalLdapConfigBindDn">Bind DN (optional)</label>
-                <input type="text" class="form-control" ng-disabled="!externalLdap.enabled" ng-model="externalLdap.bindDn" id="inputExternalLdapConfigBindDn" name="bindDn" ng-disabled="externalLdap.busy" placeholder="uid=admin,ou=Users,dc=example,dc=com">
+                <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">
               </div>
 
               <div class="form-group" ng-class="{ 'has-error': externalLdap.error.credentials }">
                 <label class="control-label" for="inputExternalLdapConfigBindPassword">Bind Password (optional)</label>
-                <input type="password" class="form-control" ng-disabled="!externalLdap.enabled" ng-model="externalLdap.bindPassword" id="inputExternalLdapConfigBindPassword" name="bindPassword" ng-disabled="externalLdap.busy" placeholder="">
+                <input type="password" class="form-control" ng-model="externalLdap.bindPassword" id="inputExternalLdapConfigBindPassword" name="bindPassword" ng-disabled="externalLdap.busy" placeholder="">
               </div>
 
               <input class="ng-hide" type="submit" ng-disabled="externalLdapConfigForm.$invalid"/>
@@ -469,12 +468,12 @@
     <div class="row">
       <div class="col-md-12">
         <p>Cloudron will authenticate users against the configured LDAP server.</p>
-        <p>LDAP authentication is currently <b>{{ externalLdap.enabled ? 'enabled' : 'disabled' }}.</p>
+        <p>LDAP authentication is currently <b>{{ externalLdap.provider === 'noop' ? 'disabled' : 'enabled' }}.</p>
 
         <br/>
 
         <button class="btn btn-primary pull-right" ng-click="externalLdap.show()">Configure</button>
-        <button class="btn btn-success pull-right" ng-disabled="!externalLdap.enabled" ng-click="externalLdap.sync()"><i class="fa fa-circle-notch fa-spin" ng-show="externalLdap.syncBusy"></i> Synchronize</button>
+        <button class="btn btn-success pull-right" ng-disabled="externalLdap.provider === 'noop'" ng-click="externalLdap.sync()"><i class="fa fa-circle-notch fa-spin" ng-show="externalLdap.syncBusy"></i> Synchronize</button>
         <a class="btn btn-primary pull-right" ng-show="externalLdap.taskId" ng-href="/logs.html?taskId={{ externalLdap.taskId }}" target="_blank">Show Logs</a>
       </div>
     </div>
diff --git a/src/views/users.js b/src/views/users.js
index 083475f6c..438fae6c3 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -11,6 +11,14 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
     $scope.showExternalLdap = true;
 
+    $scope.ldapProvider = [
+        { name: 'Active Directory', value: 'ad' },
+        { name: 'Jumpcloud', value: 'jumpcloud' },
+        { name: 'Okta', value: 'okta' },
+        { name: 'Other', value: 'other' },
+        { name: 'Disabled', value: 'noop' }
+    ];
+
     $scope.ready = false;
     $scope.users = [];
     $scope.usersById = [];
@@ -430,7 +438,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         taskId: 0,
 
         // fields
-        enabled: false,
+        provider: 'noop',
         url: '',
         baseDn: '',
         filter: '',
@@ -476,15 +484,18 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.externalLdap.error = {};
 
             var config = {
-                enabled: $scope.externalLdap.enabled,
-                url: $scope.externalLdap.url,
-                baseDn: $scope.externalLdap.baseDn,
-                filter: $scope.externalLdap.filter
+                provider: $scope.externalLdap.provider
             };
 
-            if ($scope.externalLdap.bindDn) {
-                config.bindDn = $scope.externalLdap.bindDn;
-                config.bindPassword = $scope.externalLdap.bindPassword;
+            if ($scope.externalLdap.provider !== 'noop') {
+                config.url = $scope.externalLdap.url;
+                config.baseDn = $scope.externalLdap.baseDn;
+                config.filter = $scope.externalLdap.filter;
+
+                if ($scope.externalLdap.bindDn) {
+                    config.bindDn = $scope.externalLdap.bindDn;
+                    config.bindPassword = $scope.externalLdap.bindPassword;
+                }
             }
 
             Client.setExternalLdapConfig(config, function (error) {
@@ -589,12 +600,14 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         Client.getExternalLdapConfig(function (error, result) {
             if (error) return console.error('Unable to get external ldap config.', error);
 
-            $scope.externalLdap.enabled = result.enabled;
-            $scope.externalLdap.url = result.url;
-            $scope.externalLdap.baseDn = result.baseDn;
-            $scope.externalLdap.filter = result.filter;
-            $scope.externalLdap.bindDn = result.bindDn;
-            $scope.externalLdap.bindPassword = result.bindPassword;
+            $scope.externalLdap.provider = result.provider;
+            if (result.provider !== 'noop') {
+                $scope.externalLdap.url = result.url;
+                $scope.externalLdap.baseDn = result.baseDn;
+                $scope.externalLdap.filter = result.filter;
+                $scope.externalLdap.bindDn = result.bindDn;
+                $scope.externalLdap.bindPassword = result.bindPassword;
+            }
 
             Client.getLatestTaskByType('syncExternalLdap', function (error, task) {
                 if (error) return console.error(error);