diff --git a/packages/ui-default/templates/partials/login_dialog.html b/packages/ui-default/templates/partials/login_dialog.html
index f3a130066..a4385f308 100644
--- a/packages/ui-default/templates/partials/login_dialog.html
+++ b/packages/ui-default/templates/partials/login_dialog.html
@@ -40,9 +40,9 @@
           <input type="submit" value="{{ _('Login') }}" name="login_submit" class="expanded rounded primary button">
         </div></div>
         {% endif %}
-        {%- for v in loginMethods -%}
+        {%- for v in loginMethods|default(handler.loginMethods) -%}
         <div class="row"><div class="columns">
-          <a href="{{ url('user_oauth', type=v.id, query={redirect: handler.request.url}) }}" class="expanded rounded button">{{ _(v.text) }}</a>
+          <a href="{{ url('user_oauth', type=v.id, query={redirect: handler.request.path}) }}" class="expanded rounded button">{{ _(v.text) }}</a>
         </div></div>
         {%- endfor -%}
         <div class="row"><div class="columns">
diff --git a/packages/ui-default/templates/user_login.html b/packages/ui-default/templates/user_login.html
index 8700b6aed..3a0b7a314 100644
--- a/packages/ui-default/templates/user_login.html
+++ b/packages/ui-default/templates/user_login.html
@@ -30,7 +30,7 @@
         </div>
       </div></div>
       {% endif %}
-      {%- for v in loginMethods -%}
+      {%- for v in loginMethods|default(handler.loginMethods) -%}
         <div class="row"><div class="columns">
           <a href="{{ url('user_oauth', type=v.id, query={redirect: redirect}) }}" class="expanded rounded button inverse">{{ _(v.text) }}</a>
         </div></div>