diff --git a/lab4/twidder/database.db b/lab4/twidder/database.db
index 62e952b66560737a684cb293009fc3c04ec37119..76453fb58e6894269b3999495cdd05621d8db37f 100644
Binary files a/lab4/twidder/database.db and b/lab4/twidder/database.db differ
diff --git a/lab4/twidder/server.py b/lab4/twidder/server.py
index 1734acd49c353354949c72267b2701d4fc9f1d70..f36e4271dec0cc632b66593712b9a38ad8cfe9cb 100644
--- a/lab4/twidder/server.py
+++ b/lab4/twidder/server.py
@@ -279,7 +279,7 @@ def get_user_messages_by_token():
             success=True, message="Messages retrieved", data=formatted_messages
         )
     else:
-        return create_response(success=False, message="You are not signed in")
+        return create_response(success=False, message="Authentication failed")
 
 
 @app.route("/get-user-messages-by-email", methods=["GET"])
@@ -303,7 +303,7 @@ def get_user_messages_by_email():
         else:
             return create_response(success=False, message="Recipient does no exist")
     else:
-        return create_response(success=False, message="You are not signed in")
+        return create_response(success=False, message="Authentication failed")
 
 
 @app.route("/post-message", methods=["POST"])
@@ -328,7 +328,7 @@ def post_message():
             )
         return create_response(success=True, message="Message sent")
     else:
-        return create_response(success=False, message="You are not signed in")
+        return create_response(success=False, message="Authentication failed")
 
 
 def ws_broadcast_nr_active_user_changed():
diff --git a/lab4/twidder/static/client.js b/lab4/twidder/static/client.js
index 300fda9cadf589088243504e31304a75eca183b0..0315d7b5c0e6647dfd3da8ec67438e3fe1df5ec8 100644
--- a/lab4/twidder/static/client.js
+++ b/lab4/twidder/static/client.js
@@ -394,12 +394,7 @@ function signOut() {
         window.localStorage.removeItem("token");
         window.localStorage.removeItem("email");
         displayView();
-      } else {
-        window.localStorage.removeItem("token");
-        window.localStorage.removeItem("email");
-        showModal("Token not valid. You have been logged out");
-        displayView();
-      }
+      } 
     };
 
     user_identifier = localStorage.getItem("email");
@@ -451,6 +446,12 @@ function xmlRequest(url, callback, params, token = null, requestType) {
   xhttp.onreadystatechange = function () {
     if (this.readyState == 4 && this.status == 200) {
       callback(JSON.parse(xhttp.responseText));
+      if (JSON.parse(xhttp.responseText).message === "Authentication failed") {
+        window.localStorage.removeItem("token");
+        window.localStorage.removeItem("email");
+        displayView();
+        showModal("Authentication failed. You must sign in again")
+      }
     }
   };