diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/ValidateLogin.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/ValidateLogin.js
index 5bfd17bb..b3df4137 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/ValidateLogin.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/ValidateLogin.js
@@ -67,7 +67,7 @@ minisrv-no-mail-count: true
 		if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > 1 && user_id === 0 && request_headers.query.initial_login) {
 			gourl = "wtv-head-waiter:/choose-user?"
 		} else {
-			var limitedLogin = (!ssid_sessions[socket.ssid].lockdown && (!ssid_sessions[socket.ssid].getSessionData('password_valid') && ssid_sessions[socket.ssid].getUserPasswordEnabled()));
+			var limitedLogin = (!ssid_sessions[socket.ssid].lockdown && (!ssid_sessions[socket.ssid].get('password_valid') && ssid_sessions[socket.ssid].getUserPasswordEnabled()));
 			var limitedLoginRegistered = (limitedLogin && ssid_sessions[socket.ssid].isRegistered());
 		}
 		headers = `200 OK
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-add-user-done.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-add-user-done.js
index c2634409..78f87fdc 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-add-user-done.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-add-user-done.js
@@ -33,15 +33,16 @@ if (errpage) {
         userSession.setSessionData("subscriber_username", request_headers.query.user_name);
         userSession.setSessionData("registered", true);
         var mailstore_exists = userSession.mailstore.mailstoreExists();
+        var mailbox_exists = false;
         if (!mailstore_exists) mailstore_exists = userSession.mailstore.createMailstore();
         if (mailstore_exists) {
             if (!userSession.mailstore.mailboxExists(0)) {
                 // mailbox does not yet exist, create it
-                var mailbox_exists = userSession.mailstore.createMailbox(0);
-                if (mailbox_exists) {
-                    // Just created Inbox for the first time, so create the welcome message
-                    userSession.mailstore.createWelcomeMessage();
-                }
+                mailbox_exists = userSession.mailstore.createMailbox(0);
+            }
+            if (mailbox_exists) {
+                // Just created Inbox for the first time, so create the welcome message
+                userSession.mailstore.createWelcomeMessage();
             }
         }
         if (!userSession.saveSessionData(true)) {
@@ -49,8 +50,11 @@ if (errpage) {
             headers = errpage[0];
             data = errpage[1];
         } else {
-            if (request_headers.query.user_password)
+            if (request_headers.query.user_password) {
                 userSession.setUserPassword(request_headers.query.user_password);
+                userSession.set('password_valid', true);
+            }
+            
 
             headers = `300 OK
 Content-type: text/html