diff --git a/public/js/app.js b/public/js/app.js
index 2d55fa9..96e2db6 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -17,7 +17,8 @@
 const API_URL = 'api/contributions.php';
 
 // Username set via Login Modal stored in sessionStorage
-let currentUser = sessionStorage.getItem('webgis_user') || '';
+let currentUser = sessionStorage.getItem('webgis_user') || 
+    decodeURIComponent(document.cookie.replace(/(?:(?:^|.*;\s*)webgis_user\s*=\s*([^;]*).*$)|^.*$/, '$1')) || '';
 
 // Browser Identification Number for anonymous User Identification stored as Cookie
 let browserId = getBrowserId();
@@ -955,6 +956,7 @@ function submitLogin() {
     }
     currentUser = name;
     sessionStorage.setItem('webgis_user', currentUser);
+    document.cookie = 'webgis_user=' + encodeURIComponent(name) + ';path=/;max-age=31536000;SameSite=Lax';
     document.getElementById('login-modal').style.display = 'none';
 
     // Open Create Modal if Geometry is pending