diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/ValidateLogin.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/ValidateLogin.js
index f5eef53c..a3f706ca 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/ValidateLogin.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/ValidateLogin.js
@@ -69,7 +69,7 @@ minisrv-no-mail-count: true
 `;
 		}
 	} else {
-		if (session_data.baddisk === true) {
+		if (session_data.baddisk === true && !ssid_sessions[socket.ssid].get("bad_disk_shown")) {
 			gourl = "wtv-head-waiter:/bad-disk?"
 		}
 		else if (session_data.getNumberOfUserAccounts() > 1 && user_id === 0 && (!session_data.isUserLoggedIn() || request_headers.query.initial_login || request_headers.query.relogin) ) {
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/bad-disk.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/bad-disk.js
index c955a950..74bb3540 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/bad-disk.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/bad-disk.js
@@ -84,7 +84,7 @@ data += `
 <td width=104 valign=middle align=center> <td width=20 valign=middle align=center> <td colspan=9 width=416 valign=top align=left> <table cellspacing=0 cellpadding=0> 
 <tr> 
 <td width=306 valign=top align=right><td width=20> <td width=112 valign=top align=right> 
-<form action="wtv-head-waiter:/login"> <FONT COLOR="#E7CE4A" SIZE=-1><input type="Submit" value="Continue" BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" usestyle selected></font> 
+<form action="wtv-head-waiter:/ValidateLogin?initial_login=true"> <FONT COLOR="#E7CE4A" SIZE=-1><input type="Submit" value="Continue" BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" usestyle selected></font> 
 <form action="client:poweroff"> <FONT COLOR="#E7CE4A" SIZE=-1><input type="Submit" value="Power Off" BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" usestyle selected></font> 
 <input type="Hidden" name="version" value=""> </form> 
 </table>
diff --git a/zefie_wtvp_minisrv/includes/config.json b/zefie_wtvp_minisrv/includes/config.json
index cbfd2376..e5bf4bf2 100644
--- a/zefie_wtvp_minisrv/includes/config.json
+++ b/zefie_wtvp_minisrv/includes/config.json
@@ -112,7 +112,8 @@
     "wtv-head-waiter": {
       // wtv-head-waiter handles logins
       "port": 1601,
-      "connections": 1
+      "connections": 1,
+      "privileged": true
     },
     "wtv-tricks": {
       // wtv-tricks