diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 30ed7ed6b29cd57453c3887cd74f3f1fa530b83e..acbb81a225dfb050d90367c25664d353e6091153 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,6 +1,10 @@
 - page_title "Sign in"
 
-#signin-container
+- if omniauth_enabled? && devise_mapping.omniauthable? && button_based_providers_enabled?
+  %div.append-bottom-default
+    = render 'devise/shared/omniauth_box'
+
+#signin-container.prepend-top-15
   - if form_based_providers.any?
     = render 'devise/shared/tabs_ldap'
   - else
@@ -17,7 +21,3 @@
   - if !password_authentication_enabled_for_web? && !ldap_enabled? && !(omniauth_enabled? && devise_mapping.omniauthable?)
     %div
       No authentication methods configured.
-
-  - if omniauth_enabled? && devise_mapping.omniauthable? && button_based_providers_enabled?
-    .clearfix
-      = render 'devise/shared/omniauth_box'
diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml
index 1b583ea85d6e473985b5afcc2071561321d5c218..920f5447fd4033047593d3cca9360b07c4e53b97 100644
--- a/app/views/devise/shared/_omniauth_box.html.haml
+++ b/app/views/devise/shared/_omniauth_box.html.haml
@@ -1,4 +1,4 @@
-.omniauth-container.prepend-top-15
+.omniauth-container
   %label.label-bold.d-block
     Sign in with
   - providers = enabled_button_based_providers