diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js
index 49ae3d46..fd2bfc70 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js
@@ -144,7 +144,7 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) {
 	headers += getServiceString('wtv-flashrom') + "\n";
 	if (bf0app_update) headers += "wtv-boot-url: " + gourl + "\n";
 	else {
-		headers += "wtv-boot-url: wtv-1800:/preregister?relogin=true";
+		headers += "wtv-boot-url: wtv-head-waiter:/relogin?relogin=true";
 		if (request_headers.query.guest_login) headers += "&guest_login=true";
 		headers += "\n";
 	}
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 521011cb..aaff9e62 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
@@ -43,7 +43,7 @@ wtv-ticket: ${wtvsec_login.ticket_b64}
 ${getServiceString('wtv-register')}
 ${getServiceString('wtv-head-waiter')}
 ${getServiceString('wtv-star')}
-wtv-boot-url: wtv-register:/splash?
+wtv-boot-url: wtv-head-waiter:/relogin?
 `
 	}
 	headers += `wtv-visit: ${gourl}
@@ -110,11 +110,11 @@ wtv-connection-timeout: 90
 wtv-show-time-enabled: true
 wtv-fader-timeout: 900
 wtv-tourist-enabled: true`
-	headers += "\nwtv-relogin-url: wtv-1800:/preregister?relogin=true";
+	headers += "\nwtv-relogin-url: wtv-head-waiter:/relogin?relogin=true";
 	if (request_headers.query.guest_login) headers += "&guest_login=true";
-	headers += "\nwtv-reconnect-url: wtv-1800:/preregister?reconnect=true";
+	headers += "\nwtv-reconnect-url: wtv-head-waiter:/relogin?reconnect=true";
 	if (request_headers.query.guest_login) headers += "&guest_login=true";
-	headers += "\nwtv-boot-url: wtv-1800:/preregister?relogin=true";
+	headers += "\nwtv-boot-url: wtv-head-waiter:/relogin?relogin=true";
 	if (request_headers.query.guest_login) headers += "&guest_login=true";
 	headers += "\nwtv-allow-dsc: true";
 	headers += "\nwtv-home-url: wtv-home:/home?";
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js
index ae847962..9f44b498 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js
@@ -53,8 +53,8 @@ wtv-expire-all: wtv-head-waiter:
 wtv-log-url: wtv-log:/log`;
 	if (challenge_header != "") headers += "\n" + challenge_header;
 	headers += `
-wtv-relogin-url: wtv-1800:/preregister?relogin=true
-wtv-reconnect-url: wtv-1800:/preregister?reconnect=true
+wtv-relogin-url: wtv-head-waiter:/relogin?relogin=true
+wtv-reconnect-url: wwtv-head-waiter:/relogin?reconnect=true
 wtv-visit: ${gourl}
 Content-type: text/html`;
 	data = '';
@@ -66,7 +66,7 @@ Connection: Keep-Alive
 Expires: Wed, 09 Oct 1991 22:00:00 GMT
 wtv-expire-all: wtv-head-waiter:
 wtv-expire-all: wtv-1800:
-wtv-visit: wtv-1800:/preregister?relogin=true
+wtv-visit: wtv-head-waiter:/relogin?relogin=true
 Content-type: text/html`;
 	data = '';
 }
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/relogin.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/relogin.js
new file mode 100644
index 00000000..52cb2023
--- /dev/null
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/relogin.js
@@ -0,0 +1,20 @@
+var gourl = "wtv-1800:/preregister?";
+if (request_headers.query.relogin) gourl += "relogin=true";
+else if (request_headers.query.reconnect) gourl += "reconnect=true";
+
+if (request_headers.query.guest_login) {
+	if (request_headers.query.relogin || request_headers.query.reconnect) gourl += "&";
+	gourl += "guest_login=true";
+	if (request_headers.query.skip_splash) gourl += "&skip_splash=true";
+}
+
+headers = `200 OK
+Connection: Keep-Alive
+Expires: Wed, 09 Oct 1991 22:00:00 GMT
+wtv-expire-all: wtv-head-waiter:
+wtv-expire-all: wtv-1800:
+wtv-service: reset
+${getServiceString('wtv-1800')}
+wtv-visit: ${gourl}
+Content-type: text/html`;
+data = '';
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj b/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj
index e5f9c67b..cd03b72f 100644
--- a/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj
+++ b/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj
@@ -71,6 +71,9 @@
     <Content Include="ServiceVault\wtv-flashrom\ROMCache\up-arrows.swf" />
     <Content Include="ServiceVault\wtv-flashrom\ROMCache\WebTVLogoJewel.gif" />
     <Content Include="ServiceVault\wtv-flashrom\willie.js" />
+    <Content Include="ServiceVault\wtv-head-waiter\relogin.js">
+      <SubType>Code</SubType>
+    </Content>
     <Content Include="ServiceVault\wtv-music\demo\hacktv4.gif" />
     <Content Include="ServiceVault\wtv-music\demo\index.html" />
     <Content Include="ServiceVault\wtv-music\demo\midi\acey.mid" />