Index: cspBasis/TBX/DecodeURL/tmpDev.mac.rou
===================================================================
diff -u -r18 -r79
--- cspBasis/TBX/DecodeURL/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 18)
+++ cspBasis/TBX/DecodeURL/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 79)
@@ -128,7 +128,7 @@
 	. If blnRedir  Set %session.Data("UserType")=UserType
 	. Else  Kill %session.Data("UserType")
 	
-	If (blnLMC||blnSFS||blnMBHO||blnHFLB)&&($G(RefArray("KLNR"))'>0) Do
+	If (blnLMC||blnSFS||blnMBHO||blnHFLB) && ( $$$Not(TBXContext.IsKlantIDIngevuld($G(RefArray("KLNR")))) ) Do
 	. Set blnRedir=0
 	. Set LoginState="ERR"
 	
@@ -238,7 +238,7 @@
 #If $$$NSpace="xDEMO" 
 	Quit:(Mode="A") $S(1:$$$utKlantAnon)
 #Else
-	Quit:(Mode="A") $S(blnHEIN||blnDUPO||blnHELMY||blnHFLE:$$$utKlantAnonWP, KLNr>0:$$$utKlantKnown, 1:$$$utKlantAnon)   ; blnLMC,blnSFS,blnMBHO, : $$$utKlantKnown 
+	Quit:(Mode="A") $S(blnHEIN||blnDUPO||blnHELMY||blnHFLE:$$$utKlantAnonWP, TBXContext.IsKlantIDIngevuld(KLNr):$$$utKlantKnown, 1:$$$utKlantAnon)   ; blnLMC,blnSFS,blnMBHO, : $$$utKlantKnown 
 #EndIf
 	Quit:(Mode="W") $$ophGetVERWType(Domain,Verw)
 	Quit:(Mode="P") $$$utKlantAnon                        ; Temporary: fixed value
@@ -388,7 +388,7 @@
 	. Set %OptimaVar("Data")=Data
 	. Set %OptimaVar("EncData")=$G(encData)
 	. Set Data=""
-	. Quit:($IsValidNum(KLNr))&&($G(ForceKLNrLookup,1)=0)
+	. Quit:($IsValidNum(KLNr))&&($G(ForceKLNrLookup,1)=0)   ; TBXContext.IsKlantIDIngevuld(KLNr) 
 	. ; Else  match encData with values from global
 	. Set KLNr=##class(cspBasis.GAProdTBox).GetOptimaFixKLNr($G(encData))
 	. Set:($L(KLNr)) %OptimaVar("KLNr")=KLNr