diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 328a2d8f04..04e998f8be 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -4,14 +4,14 @@
   .login-body
     - if ldap_enabled? && gitlab_config.signin_enabled
       %ul.nav.nav-tabs
-        - @ldap_servers.each do |server|
-          %li{class: (:active if server['primary'])}
+        - @ldap_servers.each_with_index do |server, i|
+          %li{class: (:active if i==0)}
             = link_to server['label'], "#tab-#{server.provider_name}", 'data-toggle' => 'tab'
         %li
           = link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab'
       .tab-content
-        - @ldap_servers.each do |server|
-          %div.tab-pane{id: "tab-#{server.provider_name}", class: (:active if server['primary'])}
+        - @ldap_servers.each_with_index do |server,i|
+          %div.tab-pane{id: "tab-#{server.provider_name}", class: (:active if i==0)}
             = render 'devise/sessions/new_ldap', provider: server.provider_name
         %div#tab-signin.tab-pane
           = render 'devise/sessions/new_base'
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 856afafb7e..4ac53c26ba 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -64,7 +64,6 @@ if Settings.ldap['enabled'] || Rails.env.test?
   if Settings.ldap['host'].present?
     excluded_per_server_settings = %w(sync_time allow_username_or_email_login)
     server = Settings.ldap.except(excluded_per_server_settings)
-    server['primary'] = true
     server['label'] = 'LDAP'
     server['provider_id'] = '' #providername will be ldap
     Settings.ldap['servers'] = [server]