diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 3051cc8058..48a8626ea9 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -6,6 +6,7 @@
 .tablerow {
 	display: table-row;
 	white-space: nowrap;
+	text-align: left;
 }
 
 .tablerow input, .tablerow textarea {
@@ -16,6 +17,10 @@
 	height: 15px;
 }
 
+#ldap .tablerow label {
+	margin-left: 3px;
+}
+
 .invisible {
 	visibility: hidden;
 }
@@ -103,6 +108,10 @@
 	vertical-align: bottom;
 }
 
+#ldap input[type=checkbox] {
+	width: 15px !important;
+}
+
 select[multiple=multiple] + button {
 	height: 28px;
 	padding-top: 6px !important;
diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index 4cb00561b3..75d3d5ea04 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -69,6 +69,7 @@ class Configuration {
 		'ldapConfigurationActive' => false,
 		'ldapAttributesForUserSearch' => null,
 		'ldapAttributesForGroupSearch' => null,
+		'ldapExperiencedAdmin' => false,
 		'homeFolderNamingRule' => null,
 		'hasPagedResultSupport' => false,
 		'hasMemberOfFilterSupport' => false,
@@ -391,6 +392,7 @@ class Configuration {
 			'last_jpegPhoto_lookup'				=> 0,
 			'ldap_nested_groups'		        => 0,
 			'ldap_paging_size'					=> 500,
+			'ldap_experienced_admin'            => 0,
 		);
 	}
 
@@ -444,6 +446,7 @@ class Configuration {
 			'last_jpegPhoto_lookup'				=> 'lastJpegPhotoLookup',
 			'ldap_nested_groups'                => 'ldapNestedGroups',
 			'ldap_paging_size'                  => 'ldapPagingSize',
+			'ldap_experienced_admin'            => 'ldapExperiencedAdmin'
 		);
 		return $array;
 	}
diff --git a/apps/user_ldap/templates/part.wizard-server.php b/apps/user_ldap/templates/part.wizard-server.php
index 422faad028..b829c775ad 100644
--- a/apps/user_ldap/templates/part.wizard-server.php
+++ b/apps/user_ldap/templates/part.wizard-server.php
@@ -69,6 +69,17 @@
 				</textarea>
 			</div>
 
+			<div class="tablerow left">
+				<label for="ldap_experienced_admin" class="tablecell">
+					<?php p($l->t('I am familiar with LDAP?'));?>
+				</label>
+
+				<input type="checkbox" id="ldap_experienced_admin" value="1"
+					name="ldap_experienced_admin" class="tablecell lwautosave"
+					title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.'));?>"
+					/>
+			</div>
+
 			<div class="tablerow">
 				<div class="tablecell ldapWizardInfo invisible">&nbsp;
 				</div>