diff --git a/Twidder (Lab3)/database.db b/Twidder (Lab3)/database.db
index d10537741a5704a2a2e1c0e53069f4e22c3d9885..38b322ef7f4eab821a6ddbd0fc7e31da1d27a2a7 100644
Binary files a/Twidder (Lab3)/database.db and b/Twidder (Lab3)/database.db differ
diff --git a/Twidder (Lab3)/static/client.html b/Twidder (Lab3)/static/client.html
index a868b208d537748ff325055cdd535fe0a57a4b78..6ef54ed3680e60f6b2338a81e7135ebd5ad398e6 100644
--- a/Twidder (Lab3)/static/client.html	
+++ b/Twidder (Lab3)/static/client.html	
@@ -74,7 +74,7 @@
                     <textarea id="BP_Message" name="story" rows="7" cols="55" placeholder="Write something here"></textarea>
                     <div><button id="BP_post_message" onclick="message_management('BP');">Post message</button></div>
                 </div>
-                <button id="BP_Reload_wall" class="browsecontent" onclick="display_wall(localStorage.getItem('browsed_email'), 'BP');">Reload wall</button>
+                <button id="BP_Reload_wall" class="browsecontent" onclick="display_wall(localStorage.getItem('reloadBrowsed'), 'BP');">Reload wall</button>
                 <div id="BP_Wall_all">
                     <div id="BP_wall" class="browsecontent"></div>
                 </div>
@@ -94,7 +94,7 @@
                     <div><button id="post_message" onclick="message_management('HP');">Post message</button></div>
                 </div>
                 <div id = "Wall">
-                    <button id="HP_Reload_wall" onclick="display_wall(localStorage.getItem('email_username'), 'HP');">Reload wall</button>
+                    <button id="HP_Reload_wall" onclick="display_wall(localStorage.getItem('reloadHome'), 'HP');">Reload wall</button>
                 </div>
                 <div id="HP_Wall_all">
                     <div id="HP_wall" class="browsecontent"></div>
diff --git a/Twidder (Lab3)/static/client.js b/Twidder (Lab3)/static/client.js
index 514383b771dbe618012a88e095c8ab070a0c296f..72aefab757ec456647a5286bd8c4d2c51503f3e4 100644
--- a/Twidder (Lab3)/static/client.js	
+++ b/Twidder (Lab3)/static/client.js	
@@ -4,11 +4,16 @@ let data_user_home = null;
 window.onload = function() {
   if(localStorage.getItem("token") != null) {
     displayProfilView();
+
     if(localStorage.getItem("browse_success") == "true") {
       localStorage.setItem("browsed_email", localStorage.getItem("reloadBrowsed"));
     } else {
       localStorage.removeItem("browsed_email");
     }
+
+    localStorage.setItem("refreshToken", "1");
+    localStorage.setItem("refreshToken2", "2");
+    localStorage.setItem("email_username", localStorage.getItem("reloadHome"));
     openTab(localStorage.getItem("tab"));
   } else {
     displayWelcomeView();
@@ -161,6 +166,7 @@ function signIn(formData) {
           let token = resp.token;
           localStorage.setItem("token", token);
           localStorage.setItem("email_username", user.email);
+          localStorage.setItem("reloadHome", user.email);
           displayProfilView();
           openTab('homePage');
         } else if(req.status == 409){
@@ -202,6 +208,11 @@ function signOut() {
         localStorage.removeItem("token");
         localStorage.removeItem("browsed_email");
         localStorage.removeItem("email_username");
+        localStorage.removeItem("refreshToken");
+        localStorage.removeItem("refreshToken2");
+        localStorage.removeItem("reloadHome");
+        localStorage.removeItem("reloadBrowsed");
+        localStorage.removeItem("browse_success");
         document.getElementById("displayprofil").innerHTML = "";
         document.getElementById("displaywelcome").innerHTML = document.getElementById("welcomeview").innerHTML;
         document.body.style.backgroundColor = "#0F98B7";
@@ -226,10 +237,10 @@ function message_management(tab){
 
   switch(tab) {
     case "HP":
-      email = localStorage.getItem("email_username");
+      email = localStorage.getItem("reloadHome");
       break;
     default:
-      email = localStorage.getItem("browsed_email");
+      email = localStorage.getItem("reloadBrowsed");
   }
 
   if(message.length > 0) {
@@ -274,10 +285,15 @@ function openTab(tabName) {
   var i, tabcontent, tablinks;
   localStorage.setItem("tab", tabName);
 
-  if(tabName != "browsePage") {
+  if(tabName != "browsePage" && localStorage.getItem("refreshToken") != "1") {
     localStorage.removeItem("browsed_email");
   }
 
+  if(tabName != "homePage" && localStorage.getItem("refreshToken2") != "2") {
+    localStorage.removeItem("email_username");
+  }
+
+
   // Get all elements with class="tabcontent" and hide them
   tabcontent = document.getElementsByClassName("tabcontent");
   for (i = 0; i < tabcontent.length; i++) {
@@ -292,12 +308,12 @@ function openTab(tabName) {
 
   if(tabName == "homePage" && localStorage.getItem("email_username") != null) {
     display_wall_info(localStorage.getItem("email_username"), "HP");
+    localStorage.removeItem("refreshToken2");
   } else if (tabName == "browsePage" && localStorage.getItem("browsed_email") != null) {
     display_wall_info(localStorage.getItem("browsed_email"), "BP");
+    localStorage.removeItem("refreshToken");
   }
 
-  console.log(data_user_home);
-
   document.getElementById("browse_error").style.display = "none";
   document.getElementById(tabName).style.display = "block";
   document.getElementById("tab_" + tabName).className += " active";
@@ -310,7 +326,6 @@ function display_wall_info(email, tab) {
   let data_user;
   get_user_info(email, tab, function(data){
     data_user = data;
-    console.log(data_user);
     if(data_user != null) {
       if(data_user.success) {
         if(tab == "BP") {