diff --git a/helios_auth/auth_systems/google.py b/helios_auth/auth_systems/google.py
index e13a9f4c7e95bf865d7a4d481b557cd8a867d2b2..00a6bb7180ffab81d5b5bf56f65f3b5b08b1d664 100644
--- a/helios_auth/auth_systems/google.py
+++ b/helios_auth/auth_systems/google.py
@@ -28,11 +28,13 @@ def get_flow(redirect_url=None):
 def get_auth_url(request, redirect_url):
   flow = get_flow(redirect_url)
 
-  request.session['google-flow'] = flow
+  request.session['google-redirect-url'] = redirect_url
   return flow.step1_get_authorize_url()
 
 def get_user_info_after_auth(request):
-  flow = request.session['google-flow']
+  flow = get_flow(request.session['google-redirect-url'])
+  del request.session['google-redirect-url']
+
   code = request.GET['code']
   credentials = flow.step2_exchange(code)
 
@@ -79,4 +81,4 @@ def check_constraint(constraint, user_info):
   """
   for eligibility
   """
-  pass
\ No newline at end of file
+  pass