diff --git a/app/views/devise/shared/_omniauth_links.haml b/app/views/devise/shared/_omniauth_links.haml
index 240c757..26a32c1 100644
--- a/app/views/devise/shared/_omniauth_links.haml
+++ b/app/views/devise/shared/_omniauth_links.haml
@@ -1,6 +1,6 @@
 - if devise_mapping.omniauthable?
   - resource_class.omniauth_providers.each do |provider|
-    - origin = session[:last_oidreq] ? '/openid/login' : nil
+    - origin = session[:last_oidreq] ? '/openid/login' : session[:user_return_to]
     - if provider.to_s == 'google'
       = link_to "", omniauth_authorize_path(resource_name, provider, origin: origin), class: provider.to_s
     - else