diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 3d91b67e748301fe17a2f5a1cae65760420ad62c..46b9f05cc17c65ef77a3c648d327867d1b16b0af 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -105,6 +105,15 @@ production: &base
   ldap:
     enabled: false
     servers:
+      ##########################################################################
+      #
+      # Since GitLab 7.4, LDAP servers get ID's (below the ID is 'main'). GitLab
+      # Enterprise Edition now supports connecting to multiple LDAP servers.
+      #
+      # If you are updating from the old (pre-7.4) syntax, you MUST give your
+      # old server the ID 'main'.
+      #
+      ##########################################################################
       main: # 'main' is the GitLab 'provider ID' of this LDAP server
         ## label
         #
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index e23ff1f985bd66d0616d59b01f16f97878c0fbed..d5cddb8dbf0ccc6c022bf788c1448c20b8a41eed 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -81,10 +81,6 @@ if Settings.ldap['enabled'] || Rails.env.test?
     server['provider_name'] ||= "ldap#{key}".downcase
     server['provider_class'] = OmniAuth::Utils.camelize(server['provider_name'])
   end
-
-  unless Settings.ldap['servers'].select{ |k, server| server['provider_name'] == "ldapmain"}.any?
-    raise "Wrong LDAP configuration. The 'main' LDAP section is missing"
-  end
 end