diff --git a/lifemonitor/auth/controllers.py b/lifemonitor/auth/controllers.py
index 548f527bd..dd4f92a10 100644
--- a/lifemonitor/auth/controllers.py
+++ b/lifemonitor/auth/controllers.py
@@ -21,7 +21,7 @@
 import logging
 
 import flask
-from flask import flash, redirect, render_template, request, url_for
+from flask import flash, redirect, render_template, request, session, url_for
 from flask_login import login_required, login_user, logout_user
 from lifemonitor.utils import (NextRouteRegistry, next_route_aware,
                                split_by_crlf)
@@ -88,14 +88,24 @@ def index():
 
 
 @blueprint.route("/profile", methods=("GET",))
-def profile(form=None, passwordForm=None, currentView=None):
+def profile(form=None, passwordForm=None, currentView=None, back=None):
     currentView = currentView or request.args.get("currentView", 'accountsTab')
     logger.debug(OpenApiSpecs.get_instance().authorization_code_scopes)
+    back_param = request.args.get('back', None)
+    logger.debug("detected back param: %r", back_param)
+    if not current_user.is_authenticated:
+        session['lm_back_param'] = back_param
+        logger.debug("Pushing back param to session")
+    else:
+        logger.debug("Getting back param from session")
+        back_param = back_param or session.get('lm_back_param', False)
+        logger.debug("detected back param: %s", back_param)
     return render_template("auth/profile.j2",
                            passwordForm=passwordForm or SetPasswordForm(),
                            oauth2ClientForm=form or Oauth2ClientForm(),
                            providers=get_providers(), currentView=currentView,
-                           oauth2_generic_client_scopes=OpenApiSpecs.get_instance().authorization_code_scopes)
+                           oauth2_generic_client_scopes=OpenApiSpecs.get_instance().authorization_code_scopes,
+                           back_param=back_param)
 
 
 @blueprint.route("/register", methods=("GET", "POST"))
diff --git a/lifemonitor/auth/templates/auth/profile.j2 b/lifemonitor/auth/templates/auth/profile.j2
index 6b26ccec9..f7d9278ae 100644
--- a/lifemonitor/auth/templates/auth/profile.j2
+++ b/lifemonitor/auth/templates/auth/profile.j2
@@ -22,6 +22,13 @@
 
     <!-- OAuth2 Client Form -->
     <div class="clearfix">
+    {% if back_param %}
+
+    <a href="#" onclick="window.close();return false;" title="{{ back_param['title'] }}" >
+      <i class="fas fa-caret-left mx-1"></i>     
+      back
+    </a>
+    {% endif %}
     {% include 'auth/oauth2_client_pane.j2' %}
     </div>
 
diff --git a/lifemonitor/utils.py b/lifemonitor/utils.py
index 12f74a68f..91fcb3651 100644
--- a/lifemonitor/utils.py
+++ b/lifemonitor/utils.py
@@ -19,6 +19,7 @@
 # SOFTWARE.
 
 
+import base64
 import functools
 import glob
 import json
@@ -119,6 +120,17 @@ def sizeof_fmt(num, suffix='B'):
     return "%.1f%s%s" % (num, 'Yi', suffix)
 
 
+def decodeBase64(str, as_object=False, encoding='utf-8'):
+    result = base64.b64decode(str)
+    if not result:
+        return None
+    if encoding:
+        result = result.decode(encoding)
+        if as_object:
+            result = json.loads(result)
+    return result
+
+
 def get_base_url():
     server_name = None
     try: