diff --git a/themes/src/main/resources/theme/keycloak-preview/account/index.ftl b/themes/src/main/resources/theme/keycloak-preview/account/index.ftl
index 71b10a12ee..dc9ff1cd79 100644
--- a/themes/src/main/resources/theme/keycloak-preview/account/index.ftl
+++ b/themes/src/main/resources/theme/keycloak-preview/account/index.ftl
@@ -134,6 +134,9 @@
                      we are unable to localize the button's message.  Not sure what to do about that yet.
                 -->
                 <ul class="nav navbar-nav navbar-right navbar-iconic">
+                    <#if referrer?has_content && referrer_uri?has_content>
+                        <li><a class="nav-item-iconic" href="${referrer_uri}" id="referrer"><span class="pficon-arrow"></span>${msg("backTo",referrer)}</a></li>
+                    </#if>
                     <li><button id="signInButton" style="visibility:hidden" onclick="keycloak.login();" class="btn btn-primary btn-lg btn-sign" type="button">${msg("doLogIn")}</button></li>
                     <#if realm.internationalizationEnabled  && supportedLocales?size gt 1>
                         <li class="dropdown">
@@ -227,6 +230,7 @@
 
         <script>
             var winHash = window.location.hash;
+                console.log('winHash=' + winHash);
             if ((winHash.indexOf('#/') == 0) && (!winHash.indexOf('#/&state') == 0)) {
                 document.getElementById("welcomeScreen").style.display='none';
             }