diff --git a/src/modules/sub-web.js b/src/modules/sub-web.js
index 5bf5cf4..033a74c 100644
--- a/src/modules/sub-web.js
+++ b/src/modules/sub-web.js
@@ -185,16 +185,18 @@ function IOConnection(io) {
 
                 var utoken = ucookies.token
                 const online_users_data = auth.getSimpleUser(utoken)
-                if(online_users_data) {
+                
 
-                    usersOnline.push(online_users_data)
-                }
-               
+                usersOnline.push(online_users_data)
+                
+                alog.log(online_users_data.username + " - Connexion du serveur")
             }
 
             io.sockets.emit("ALWAYS/ALL_CONNECTED_USER", usersOnline)
+           
+              
 
-        wlog.log("[SOCKET] - Nouvelle session : " + socket.id)
+            wlog.log("[SOCKET] - Nouvelle session : " + socket.id)
 
         
 
@@ -205,9 +207,21 @@ function IOConnection(io) {
 
                 var utoken = ucookies.token
                 const online_users_data = auth.getSimpleUser(utoken)
-                if(online_users_data) {
-                    usersOnline.splice(usersOnline.indexOf(online_users_data), 1)
+
+                var userIndex = -1
+
+                for(var user of usersOnline) {
+                    if(user.username == online_users_data.username) {
+
+                        userIndex = usersOnline.indexOf(user)
+                    } 
+
                 }
+
+                alog.log(online_users_data.username + " - Deconnexion du serveur")
+              
+                usersOnline.splice(userIndex, 1)
+                
                 
             }
 
diff --git a/src/web/public/javascript/__index_script.js b/src/web/public/javascript/__index_script.js
index 31b50b9..b1df09e 100644
--- a/src/web/public/javascript/__index_script.js
+++ b/src/web/public/javascript/__index_script.js
@@ -138,6 +138,8 @@ homeBtn.addEventListener("click", () => {
 
 function loadHome() {
 
+    wasOnHome = true
+
     mainView.innerHTML = WelcomeContent
     wasOnPlaylist = false