diff --git a/package.json b/package.json
index 51e0e43..3412661 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "call-me",
-    "version": "1.0.9",
+    "version": "1.0.10",
     "description": "Your Go-To for Instant Video Calls",
     "author": "Miroslav Pejic - miroslav.pejic.85@gmail.com",
     "license": "AGPLv3",
diff --git a/public/client.js b/public/client.js
index 553b657..2366c4a 100755
--- a/public/client.js
+++ b/public/client.js
@@ -39,6 +39,9 @@ document.addEventListener('DOMContentLoaded', function () {
     const tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
         return new bootstrap.Tooltip(tooltipTriggerEl);
     });
+    // Handle localStorage data
+    usernameIn.value = localStorage.callMeUsername ? localStorage.callMeUsername : '';
+    callUsernameIn.value = localStorage.callMeUsernameToCall ? localStorage.callMeUsernameToCall : '';
 });
 
 // WebSocket event listeners
@@ -112,6 +115,7 @@ function handleSignInClick() {
             type: 'signIn',
             name: userName,
         });
+        localStorage.callMeUsername = userName;
     }
 }
 
@@ -130,6 +134,7 @@ function handleCallClick() {
             from: userName,
             to: callToUsername,
         });
+        localStorage.callMeUsernameToCall = callToUsername;
     } else {
         handleError('Please enter a username to call.');
     }