diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js
index 047cdef7..9bcf67fc 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js
@@ -86,7 +86,7 @@ wtv-ssl-timeout: 240
 wtv-login-timeout: 7200
 `;
 		if (!limitedLogin) {
-
+			ssid_sessions[socket.ssid].assignMailstore();
 			headers += getServiceString('all', { "exceptions": ["wtv-register"] });
 			if (offline_user_list) headers += "wtv-offline-user-list: " + offline_user_list + "\n";
 			headers += `wtv-messenger-authorized: ${messenger_authorized}
diff --git a/zefie_wtvp_minisrv/WTVClientSessionData.js b/zefie_wtvp_minisrv/WTVClientSessionData.js
index 17889d95..40d8aca0 100644
--- a/zefie_wtvp_minisrv/WTVClientSessionData.js
+++ b/zefie_wtvp_minisrv/WTVClientSessionData.js
@@ -47,18 +47,16 @@ class WTVClientSessionData {
         ];
         this.lockdownWhitelist.push(minisrv_config.config.unauthorized_url);
         this.lockdownWhitelist.push(minisrv_config.config.service_logo);
-
+        this.mailstore = new WTVMail(this.minisrv_config, this)
         this.loginWhitelist = Object.assign([], this.lockdownWhitelist); // clone lockdown whitelist into login whitelist
         this.loginWhitelist.push("wtv-head-waiter:/choose-user");
-        this.loginWhitelist.push("wtv-head-waiter:/password");
-        this.mailstore = new WTVMail(minisrv_config, this);
+        this.loginWhitelist.push("wtv-head-waiter:/password");        
     }
 
-
     switchUserID(user_id, update_mail = true, update_ticket = true) {
         this.user_id = user_id;
         this.loadSessionData();
-        this.mailstore = new WTVMail(this.minisrv_config, this.ssid, this)
+        this.mailstore = new WTVMail(this.minisrv_config, this)
         if (this.data_store.wtvsec_login && update_ticket) this.setTicketData('user_id', user_id);
     }
 
diff --git a/zefie_wtvp_minisrv/WTVMail.js b/zefie_wtvp_minisrv/WTVMail.js
index 42729283..d34465de 100644
--- a/zefie_wtvp_minisrv/WTVMail.js
+++ b/zefie_wtvp_minisrv/WTVMail.js
@@ -15,9 +15,7 @@ class WTVMail {
     wtvclient = null;
     WTVClientSessionData = null;
     mailstore_dir = null;
-    is_guest = null;
     mailboxes = null;
-
     msgFileExt = ".zmsg";
     trashMailboxName = "Trash";
 
@@ -25,14 +23,12 @@ class WTVMail {
         if (!minisrv_config) throw ("minisrv_config required");
         var WTVShared = require('./WTVShared.js')['WTVShared'];
         var WTVMime = require('./WTVMime.js');
-        var WTVClientSessionData = require('./WTVClientSessionData.js');
+        this.WTVClientSessionData = require('./WTVClientSessionData.js');
         this.minisrv_config = minisrv_config;
         this.wtvshared = new WTVShared(minisrv_config);
         this.wtvmime = new WTVMime(minisrv_config);
         this.wtvclient = wtvclient;
-        this.is_guest = !this.wtvclient.isRegistered();
-        this.ssid = wtvclient.ssid;
-        console.log(this.ssid);
+        this.ssid = this.wtvclient.ssid;
         this.unread_mail = this.wtvclient.getSessionData("subscriber_unread_mail") ? this.wtvclient.getSessionData("subscriber_unread_mail") : 0;
         this.mailboxes = [
             // referenced by id, so order is important!