diff --git a/app.py b/app.py
index 72eb38573c5961ca221855acadfa5db6441e46d4..73e7b884a2d7471a2c852f18e0c3aa59d62c1f29 100644
--- a/app.py
+++ b/app.py
@@ -39,7 +39,11 @@ def create_app(test_config=None):
 		client = get_oauth()
 		url, state = client.authorization_url(app.config['OAUTH2_AUTH_URL'])
 		session['state'] = state
-		session['url'] = request.values.get('url', '/')
+		parts = request.full_path.split('?rawurl=', 1)
+		if len(parts) == 2:
+			session['url'] = parts[1]
+		else:
+			session['url'] = request.values.get('url', '/')
 		return redirect(url)
 
 	@app.route("/callback")