diff --git a/src/views/users.html b/src/views/users.html
index 90e1d95ed..82f0c39ac 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -295,6 +295,14 @@
               <!-- avoid browsers to attempt an autofill for bindDN/bindPassword -->
               <input type="password" style="display: none;">
 
+              <div class="form-group">
+                <div class="checkbox">
+                  <label>
+                    <input type="checkbox" ng-model="externalLdap.autoCreate"> Auto create users on first login
+                  </label>
+                </div>
+              </div>
+
               <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-model="externalLdap.url" id="inputExternalLdapConfigUrl" name="url" ng-disabled="externalLdap.busy" placeholder="ldaps://example.com:636" required>
@@ -486,6 +494,15 @@
       </div>
     </div>
 
+    <div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
+      <div class="col-xs-6">
+        <span class="text-muted">User auto creation</span>
+      </div>
+      <div class="col-xs-6 text-right">
+        <span>{{ externalLdap.currentConfig.autoCreate ? 'Yes' : 'No' }}</span>
+      </div>
+    </div>
+
     <div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
       <div class="col-xs-6">
         <span class="text-muted">Server URL</span>
diff --git a/src/views/users.js b/src/views/users.js
index a07435daa..6bb2a321f 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -443,6 +443,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
         // fields
         provider: 'noop',
+        autoCreate: false,
         url: '',
         baseDn: '',
         filter: '',
@@ -509,6 +510,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.externalLdap.bindDn = $scope.externalLdap.currentConfig.bindDn;
             $scope.externalLdap.bindPassword = $scope.externalLdap.currentConfig.bindPassword;
             $scope.externalLdap.usernameField = $scope.externalLdap.currentConfig.usernameField;
+            $scope.externalLdap.autoCreate = $scope.externalLdap.currentConfig.autoCreate;
 
             $('#externalLdapModal').modal('show');
         },
@@ -526,6 +528,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                 config.baseDn = $scope.externalLdap.baseDn;
                 config.filter = $scope.externalLdap.filter;
                 config.usernameField = $scope.externalLdap.usernameField;
+                config.autoCreate = $scope.externalLdap.autoCreate;
 
                 if ($scope.externalLdap.bindDn) {
                     config.bindDn = $scope.externalLdap.bindDn;