diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user-password.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user-password.js
index c61e257c..3153b76b 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user-password.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user-password.js
@@ -1,7 +1,6 @@
 var minisrv_service_file = true;
 var errpage = null;
 
-const WTVRegister = require(classPath + "/WTVRegister.js")
 const wtvr = new WTVRegister(minisrv_config, SessionStore);
 
 if (session_data.user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/edit-user-begin.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/edit-user-begin.js
index 75155bdb..85b6e3d9 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/edit-user-begin.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/edit-user-begin.js
@@ -19,7 +19,9 @@ if (session_data.user_id != 0 && session_data.user_id != request_headers.query.u
 if (user_id != null) {
     headers = `200 OK
 Connection: Keep-Alive
-Content-Type: text/html`
+Content-Type: text/html
+wtv-expire-all: wtv-setup:/edit-user
+wtv-noback-all: wtv-setup:/edit-user`
     var userSession = null;
     if (session_data.user_id == request_headers.query.user_id) userSession = session_data;
     else {
@@ -83,7 +85,7 @@ ${(user_id == 0) ? 'Subscriber' : 'User'} information
 <td>
 <td absheight=244 valign=top align=left>
 <form
-action="wtv-setup:/serve-billing-overview"
+action="client:goback"
 >
 <P>
 <table cellspacing=0 cellpadding=0 border=0>
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 3d497352..671ae6ec 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
@@ -16,8 +16,9 @@ if (!errpage) {
 }
 
 if (!errpage) {
-    if (session_data.getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);
+    var wtvr = new WTVRegister(minisrv_config, SessionStore);
 
+    if (session_data.getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);
     if (!request_headers.query.user_name) errpage = wtvshared.doErrorPage(400, "Please enter a username.");
     else if (request_headers.query.user_name.length < minisrv_config.config.user_accounts.min_username_length) errpage = wtvshared.doErrorPage(400, "Please choose a username with <b>" + minisrv_config.config.user_accounts.min_username_length + "</b> or more characters.");
     else if (request_headers.query.user_name.length > minisrv_config.config.user_accounts.max_username_length) errpage = wtvshared.doErrorPage(400, "Please choose a username with <b>" + minisrv_config.config.user_accounts.max_username_length + "</b> or less characters.");
diff --git a/zefie_wtvp_minisrv/includes/config.json b/zefie_wtvp_minisrv/includes/config.json
index 84bf8f33..05ef88bb 100644
--- a/zefie_wtvp_minisrv/includes/config.json
+++ b/zefie_wtvp_minisrv/includes/config.json
@@ -156,7 +156,8 @@
       "connections": 3,
       "privileged": true,
       "modules": [
-        "WTVBGMusic"
+        "WTVBGMusic",
+        "WTVRegister"
       ]
     },
     "wtv-music": {