diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 436964aaba..021bd0a494 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -233,10 +233,6 @@ module ApplicationHelper
     end
   end
 
-  def ldap_enabled?
-    Gitlab.config.ldap.enabled
-  end
-
   def link_to(name = nil, options = nil, html_options = nil, &block)
     begin
       uri = URI(options)
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index f6a4247e02..7e30155a78 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -52,7 +52,6 @@ class Settings < Settingslogic
   end
 end
 
-
 # Default settings
 Settings['ldap'] ||= Settingslogic.new({})
 Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil?
diff --git a/config/initializers/7_omniauth.rb b/config/initializers/7_omniauth.rb
index 7ef5c10da0..3c1e8329d3 100644
--- a/config/initializers/7_omniauth.rb
+++ b/config/initializers/7_omniauth.rb
@@ -1,9 +1,13 @@
 module OmniAuth::Strategies
-  server = Gitlab.config.ldap.servers.values.first
-  const_set(server['provider_class'], Class.new(LDAP))
+  Gitlab::LDAP::Config.servers.each do |server|
+    # do not redeclare LDAP
+    next if server['provider_name'] == 'ldap'
+    const_set(server['provider_class'], Class.new(LDAP))
+  end
 end
 
 OmniauthCallbacksController.class_eval do
-  server = Gitlab.config.ldap.servers.values.first
-  alias_method server['provider_name'], :ldap
-end
\ No newline at end of file
+  Gitlab::LDAP::Config.servers.each do |server|
+    alias_method server['provider_name'], :ldap
+  end
+end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 226cacfe0d..232e465318 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -205,7 +205,7 @@ Devise.setup do |config|
   # end
 
   if Gitlab.config.ldap.enabled
-    Gitlab.config.ldap.servers.values.each do |server|
+    Gitlab::LDAP::Config.servers.each do |server|
       if server['allow_username_or_email_login']
         email_stripping_proc = ->(name) {name.gsub(/@.*$/,'')}
       else
diff --git a/lib/gitlab/ldap/adapter.rb b/lib/gitlab/ldap/adapter.rb
index 82659db639..3d1e05bd64 100644
--- a/lib/gitlab/ldap/adapter.rb
+++ b/lib/gitlab/ldap/adapter.rb
@@ -31,7 +31,7 @@ module Gitlab
       #
       def groups(cn = "*", size = nil)
         options = {
-          base: config['group_base'],
+          base: config.group_base,
           filter: Net::LDAP::Filter.eq("cn", cn)
         }