diff --git a/app/__init__.py b/app/__init__.py
index 2ef919da9436d4b7675c4e7276c97d8c5bd67a72..c30a7f15fe768cea4c82808aeb8b10d79d782177 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -22,7 +22,11 @@ def create_app(config_name):
             session['uid']=str(uuid.uuid4())
 
         if "redir" in request.args and 'return_url' not in session: # check for redir arg in url
-            session['return_url'] = request.args.get("redir") or vars.default_referrer or request.referrer
+            session['return_url'] = request.args.get("redir")
+        elif "redir" not in request.args and 'return_url' not in session:
+            session['return_url'] = vars.default_referrer
+        else:
+            session['return_url'] = request.referrer
 
         return render_template('auth/SignUp.html', room_id=session['uid'], referrer=session['return_url'])