Index: APPS/TBXWeb/LoginBypass/LogonRequestVerwerker.cls.xml
===================================================================
diff -u -r770 -r771
--- APPS/TBXWeb/LoginBypass/LogonRequestVerwerker.cls.xml	(.../LogonRequestVerwerker.cls.xml)	(revision 770)
+++ APPS/TBXWeb/LoginBypass/LogonRequestVerwerker.cls.xml	(.../LogonRequestVerwerker.cls.xml)	(revision 771)
@@ -31,12 +31,16 @@
 	Set LogonResult = ##class(APPS.TBXWeb.LoginBypass.dto.Result).%New()
 
 	Set RqSubmit = $G(CspRequest.Data("LOGON",1))
-	Set LogonResult.IsLogonRequested = ($L(RqSubmit) > 0)
-	
 	If ($$$UCase(RqSubmit) = "LOGIN") {
-		Set RqUsername = $G(CspRequest.Data("USERNAME",1))
+		Set RqUsername = $G(CspRequest.Data("USER",1))
 		Set RqPassword = $G(CspRequest.Data("PSW",1))
-
+		Set LogonResult.IsLogonRequested = $$$Not( ($$$Trim(RqUsername)="") && ($$$Trim(RqPassword)="") )
+	}
+	Else {
+		Set LogonResult.IsLogonRequested = $$$False
+	}
+	
+	If LogonResult.IsLogonRequested {
 		Set UrlBepaler = ##class(APPS.TBXWeb.LoginBypass.TandemboxUrlBepaler).%New(..Taal)
 		Set TandemboxUrl = UrlBepaler.GeefTandemboxUrl(RqUsername,RqPassword,IpAdres)