diff --git a/app.js b/app.js
index 3748317..fab61fb 100644
--- a/app.js
+++ b/app.js
@@ -18,6 +18,9 @@ let userAvatar = '';
 let registeredUsers = JSON.parse(localStorage.getItem('registeredUsers')) || {};
 let peerCount = 0;
 
+// Load user information from localStorage
+let currentUser = JSON.parse(localStorage.getItem('currentUser')) || { username: 'Anonymous', avatar: '' };
+
 async function initialize() {
   swarm = new Hyperswarm();
 
@@ -50,18 +53,15 @@ async function initialize() {
     messageForm.addEventListener('submit', sendMessage);
   }
 
-  const savedUser = localStorage.getItem('currentUser');
-  if (savedUser) {
-    const user = JSON.parse(savedUser);
-    userName = user.username;
-    userAvatar = user.avatar || '';
+  // Set current user if available in localStorage
+  if (currentUser.username) {
+    userName = currentUser.username;
+    userAvatar = currentUser.avatar || '';
     const setupDiv = document.querySelector('#setup');
-    if (setupDiv) {
-      setupDiv.classList.remove('hidden');
-    }
-  } else {
     const registerDiv = document.querySelector('#register');
-    if (registerDiv) {
+    if (userName !== 'Anonymous' && setupDiv) {
+      setupDiv.classList.remove('hidden');
+    } else if (registerDiv) {
       registerDiv.classList.remove('hidden');
     }
   }
@@ -272,3 +272,9 @@ async function updateIcon(username, avatarBuffer) {
 }
 
 initialize();
+
+// Save the current user's information before closing the application
+window.addEventListener('beforeunload', () => {
+  localStorage.setItem('currentUser', JSON.stringify({ username: userName, avatar: userAvatar }));
+});
+