diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss
index 4c0c0839fe2c6abc592cfd8511b0d38cceb4d5cc..e6d9be5185d404739db61a6ca2eccc913c243ec5 100644
--- a/app/assets/stylesheets/pages/login.scss
+++ b/app/assets/stylesheets/pages/login.scss
@@ -124,15 +124,20 @@
     display: -webkit-flex;
     display: flex;
     box-shadow: 0 0 0 1px $border-color;
-    border-top-right-radius: 2px;
-    border-top-left-radius: 2px;
+    border-top-right-radius: $border-radius-default;
+    border-top-left-radius: $border-radius-default;
 
     li {
       flex: 1;
       text-align: center;
 
+      &:first-of-type {
+        border-top-left-radius: $border-radius-default;
+      }
+
       &:last-of-type {
         border-left: 1px solid $border-color;
+        border-top-right-radius: $border-radius-default;
       }
 
       &:not(.active) {
diff --git a/app/views/devise/sessions/_new_crowd.html.haml b/app/views/devise/sessions/_new_crowd.html.haml
index e82a08cdb0c2515e35408405ce50613327cbe157..1d381ad78932a6a1bd623a9ea2982efedd5b9c7d 100644
--- a/app/views/devise/sessions/_new_crowd.html.haml
+++ b/app/views/devise/sessions/_new_crowd.html.haml
@@ -1,6 +1,6 @@
 = form_tag(omniauth_authorize_path(:user, :crowd), id: 'new_crowd_user', class: 'show-gl-field-errors') do
   .form-group
-    = label_tag 'Username or email', for: :username
+    = label_tag :username, 'Username or email'
     = text_field_tag :username, nil, {class: "form-control top", title: "This field is required", autofocus: "autofocus", required: true }
   .form-group
     = label_tag :password
@@ -10,4 +10,4 @@
       %label{for: "remember_me"}
         = check_box_tag :remember_me, '1', false, id: 'remember_me'
         %span Remember me
-  = button_tag "Sign in", class: "btn-save btn"
+  = submit_tag "Sign in", class: "btn-save btn"
diff --git a/app/views/devise/sessions/_new_ldap.html.haml b/app/views/devise/sessions/_new_ldap.html.haml
index b26efbb453518aba81c4c79d6f389a85463a4dde..c18bc2ac413feeee93f03f1b195fae9f4132f911 100644
--- a/app/views/devise/sessions/_new_ldap.html.haml
+++ b/app/views/devise/sessions/_new_ldap.html.haml
@@ -1,6 +1,6 @@
 = form_tag(omniauth_callback_path(:user, server['provider_name']), id: 'new_ldap_user', class: "show-gl-field-errors") do
   .form-group
-    = label_tag "#{server['label']} Login", for: :username
+    = label_tag :username, "#{server['label']} Username"
     = text_field_tag :username, nil, {class: "form-control top", title: "This field is required.", autofocus: "autofocus", required: true }
   .form-group
     = label_tag :password
@@ -10,4 +10,4 @@
       %label{for: "remember_me"}
         = check_box_tag :remember_me, '1', false, id: 'remember_me'
         %span Remember me
-  = button_tag "Sign in", class: "btn-save btn"
+  = submit_tag "Sign in", class: "btn-save btn"
diff --git a/app/views/devise/shared/_signin_box.html.haml b/app/views/devise/shared/_signin_box.html.haml
index 810dd5ab6875c84db4c0f0f3714d3c6520815ee0..86edaf14e43287d8f3d54d7233dabc05ccf1672d 100644
--- a/app/views/devise/shared/_signin_box.html.haml
+++ b/app/views/devise/shared/_signin_box.html.haml
@@ -1,15 +1,18 @@
-#login-pane.login-box{ role: 'tabpanel', class: 'tab-pane active' }
-  .login-body
-    - if form_based_providers.any?
-      - if crowd_enabled?
-        %div.tab-pane.active{id: "tab-crowd"}
-          = render 'devise/sessions/new_crowd'
-      - @ldap_servers.each_with_index do |server, i|
-        %div.tab-pane{id: "tab-#{server['provider_name']}", class: (:active if i.zero? && !crowd_enabled?)}
-          = render 'devise/sessions/new_ldap', server: server
-      - if signin_enabled?
-        %div#tab-signin.tab-pane
-          = render 'devise/sessions/new_base'
+- if form_based_providers.any?
+  - if crowd_enabled?
+    .login-box.tab-pane.active{id: "crowd", role: 'tabpanel', class: 'tab-pane'}
+      .login-body
+        = render 'devise/sessions/new_crowd'
+  - @ldap_servers.each_with_index do |server, i|
+    .login-box.tab-pane{id: "#{server['provider_name']}", role: 'tabpanel', class: (:active if i.zero? && !crowd_enabled?)}
+      .login-body
+        = render 'devise/sessions/new_ldap', server: server
+  - if signin_enabled?
+    .login-box.tab-pane{id: 'ldap-standard', role: 'tabpanel'}
+      .login-body
+        = render 'devise/sessions/new_base'
 
-    - elsif signin_enabled?
+- elsif signin_enabled?
+  .login-box.tab-pane.active{id: 'login-pane', role: 'tabpanel'}
+    .login-body
       = render 'devise/sessions/new_base'
diff --git a/app/views/devise/shared/_tabs_ldap.html.haml b/app/views/devise/shared/_tabs_ldap.html.haml
index e276e91433ad6a3d25016456e6d5dea77e64bbe3..a057f126c4548c4a7141036b10798fca1aa52d5b 100644
--- a/app/views/devise/shared/_tabs_ldap.html.haml
+++ b/app/views/devise/shared/_tabs_ldap.html.haml
@@ -1,10 +1,10 @@
 %ul.new-session-tabs.nav-links.nav-tabs
   - if crowd_enabled?
     %li.active
-      = link_to "Crowd", "#tab-crowd", 'data-toggle' => 'tab'
+      = link_to "Crowd", "#crowd", 'data-toggle' => 'tab'
   - @ldap_servers.each_with_index do |server, i|
     %li{class: (:active if i.zero? && !crowd_enabled?)}
-      = link_to server['label'], "#tab-#{server['provider_name']}", 'data-toggle' => 'tab'
+      = link_to server['label'], "##{server['provider_name']}",  'data-toggle' => 'tab'
   - if signin_enabled?
     %li
-      = link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab'
+      = link_to 'Standard', '#ldap-standard', 'data-toggle' => 'tab'
diff --git a/spec/views/devise/shared/_signin_box.html.haml_spec.rb b/spec/views/devise/shared/_signin_box.html.haml_spec.rb
index ee362e6fcb3225a5359ede8ada383cdc50ef06b1..1397bfa5864e8991f3b24a7fb8548467cb3435a1 100644
--- a/spec/views/devise/shared/_signin_box.html.haml_spec.rb
+++ b/spec/views/devise/shared/_signin_box.html.haml_spec.rb
@@ -12,13 +12,13 @@ describe 'devise/shared/_signin_box' do
 
       render
 
-      expect(rendered).to have_selector('#tab-crowd form')
+      expect(rendered).to have_selector('#crowd form')
     end
 
     it 'is not shown when Crowd is disabled' do
       render
 
-      expect(rendered).not_to have_selector('#tab-crowd')
+      expect(rendered).not_to have_selector('#crowd')
     end
   end