diff --git a/src/views/users.html b/src/views/users.html
index 82f0c39ac..37333d972 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -295,14 +295,6 @@
               <!-- 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>
@@ -333,6 +325,14 @@
                 <input type="password" class="form-control" ng-model="externalLdap.bindPassword" id="inputExternalLdapConfigBindPassword" name="bindPassword" ng-disabled="externalLdap.busy" placeholder="">
               </div>
 
+              <div class="form-group">
+                <div class="checkbox">
+                  <label>
+                    <input type="checkbox" ng-model="externalLdap.autoCreate"> Automatically create users when they login to Cloudron
+                  </label>
+                </div>
+              </div>
+
               <input class="ng-hide" type="submit" ng-disabled="externalLdapConfigForm.$invalid"/>
             </fieldset>
           </form>
@@ -494,15 +494,6 @@
       </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>
@@ -548,6 +539,15 @@
       </div>
     </div>
 
+    <div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
+      <div class="col-xs-6">
+        <span class="text-muted">Automatically create users when they login to Cloudron </span>
+      </div>
+      <div class="col-xs-6 text-right">
+        <span>{{ externalLdap.currentConfig.autoCreate ? 'Yes' : 'No' }}</span>
+      </div>
+    </div>
+
     <div class="row">
       <br/>
       <div class="col-md-12" style="margin-bottom: 10px;">