diff --git a/app/__init__.py b/app/__init__.py
index 2a12479782e4f9fd1fff108c63690d57139ad730..f33cb015618c6906fd07980b74f741bf2217a5e5 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -14,21 +14,18 @@ def create_app(config_name):
     app = Flask(__name__) # initialization of the flask app
     Bootstrap(app) # allowing app to use bootstrap
 
-    global return_url
-    return_url = ''
-
     @app.route('/', methods=['GET', 'POST']) # initial route to display the reg page
     def index():
-        global return_url
 
         if 'username' not in session:
             session['username'] = "name_test" + str(random.randint(0, 10000))
+            # session['username'] = request.remote_user
 
         if 'uid' not in session:
             session['uid']=str(uuid.uuid4())
 
-        if "redir" in request.args and return_url == "": # check for redir arg in url
-            return_url = request.args.get("redir") or "/pun/sys/dashboard"
+        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 "/pun/sys/dashboard"
 
         return render_template('auth/SignUp.html', user=session['username'], room_id=session['uid'])
 
diff --git a/app_flow.png b/app_flow.png
deleted file mode 100644
index cdbb42799207489123be7d8229203a9d0592de62..0000000000000000000000000000000000000000
Binary files a/app_flow.png and /dev/null differ