diff --git a/web-assets/js/setupAuth0WithRedirect.js b/web-assets/js/setupAuth0WithRedirect.js
index 128d86a..0b0f71f 100644
--- a/web-assets/js/setupAuth0WithRedirect.js
+++ b/web-assets/js/setupAuth0WithRedirect.js
@@ -61,6 +61,7 @@ const authSetup = function () {
 
     const init = function () {
         correctOldUrl();
+        changeWindowMessage();
         createAuth0Client({
             domain: domain,
             client_id: clientId,
@@ -161,6 +162,13 @@ const authSetup = function () {
         setCookie(tcJWTCookie, "", -1);
         setCookie(v3JWTCookie, "", -1);
         setCookie(tcSSOCookie, "", -1);
+
+        // to clear any old session
+        setCookie('auth0Jwt', "", -1);
+        setCookie('zendeskJwt', "", -1);
+        setCookie('auth0Refresh', "", -1);
+        // for scorecard
+        setCookie('JSESSIONID', "", -1);
     };
 
     const isLoggedIn = function () {
@@ -355,6 +363,17 @@ const authSetup = function () {
 
     }
 
+    function changeWindowMessage() {
+        if ((!returnAppUrl && !appUrl) || ((returnAppUrl == 'undefined') && (appUrl == 'undefined'))) {
+            try {
+                document.getElementById("page-title-heading").innerHTML = "Alert";
+                document.getElementById("loading_message_p").innerHTML = "Login/Logout action is not called. Please check return url (retUrl) value in query parameters."
+            } catch (err) {
+                logger("Error in changing loading message: ", err.message)
+            }
+        }
+    }
+
     // execute    
     init();
 };
diff --git a/web-assets/static-pages/index.html b/web-assets/static-pages/index.html
index b572ca9..38db79e 100644
--- a/web-assets/static-pages/index.html
+++ b/web-assets/static-pages/index.html
@@ -35,7 +35,7 @@
         <main id="main" class="page-main">
           <a id="contentarea" tabindex="-1"></a>
           <h1 id="page-title-heading" class="page-title-heading">loading...</h1>
-          <p class="page-description">
+          <p class="page-description" id="loading_message_p">
             Wait Login/Logout processing ...
           </p>
         </main>