diff --git a/BottomSpace/DeleteTradingHistory.js b/BottomSpace/DeleteTradingHistory.js
index e6ec098e8..b4f4c692e 100644
--- a/BottomSpace/DeleteTradingHistory.js
+++ b/BottomSpace/DeleteTradingHistory.js
@@ -288,9 +288,12 @@ function newDeleteTradingHistory() {
 
             if (INFO_LOG === true) { logger.write("[INFO] draw -> Entering function."); }
 
-            let user = window.localStorage.getItem("user");
+            let sessionToken = window.localStorage.getItem('sessionToken');
 
-            if (user === null) { return; }
+            if (sessionToken === null || sessionToken === "") {
+                /* not logged in */
+                return;
+            }
 
             thisObject.container.frame.draw(false, false);
 
diff --git a/BottomSpace/PlayStopButton.js b/BottomSpace/PlayStopButton.js
index 1233cd3fb..b1ad6d469 100644
--- a/BottomSpace/PlayStopButton.js
+++ b/BottomSpace/PlayStopButton.js
@@ -124,9 +124,12 @@ function newPlayStopButton() {
 
     function draw() {
 
-        let user = window.localStorage.getItem("user");
+        let sessionToken = window.localStorage.getItem('sessionToken');
 
-        if (user === null) { return; }
+        if (sessionToken === null || sessionToken === "") {
+            /* not logged in */
+            return;
+        }
 
         thisObject.container.frame.draw(false, false);
 
diff --git a/TopSpace/Login.js b/TopSpace/Login.js
index 9067f46ac..65511a040 100644
--- a/TopSpace/Login.js
+++ b/TopSpace/Login.js
@@ -34,7 +34,14 @@ function newLogin() {
         const accessToken = window.localStorage.getItem("access_token");
         let user = window.localStorage.getItem("user");
 
-        if (user === null) { return; }
+        if (user === null) {
+
+            // if there is no user that means that we are logged off, which means it is time to clean the local storage of things from the last log in.
+
+            window.localStorage.removeItem("loggedInUser");
+            window.localStorage.removeItem('sessionToken');
+            return;
+        }
 
         user = JSON.parse(user);