Index: WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml
===================================================================
diff -u -r44577 -r44587
--- WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 44577)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 44587)
@@ -96,7 +96,7 @@
 				Set KlantData = ..GeefHandelKlantDataVoorDecrypteer(LoginParameters)
 				Set KlantData.ID = ..SettingsManager.GeefVhisie4Prefix(HandelPersonality)_..WebshopSessionService.GeefVolgendeKlantID(HandelPersonality.GeefID())
 			} Else {
-				Set KlantData = ..HandelKlantDataRepository.GeefViaID(..SettingsManager.GeefVhisie4Prefix(HandelPersonality)_LoginParameters.KlantID)
+				Set KlantData = ..HandelKlantDataRepository.GeefViaID(LoginParameters.KlantID)
 				Set KlantData.ID = LoginParameters.KlantID
 			}
  			Do ..KortingBewaarder.BewaarMeegegevenKorting(DecrypteerRequest.Ref,DecrypteerRequest.DataOpt)
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml
===================================================================
diff -u -r42189 -r44587
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 42189)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 44587)
@@ -55,7 +55,7 @@
 	Do KortingBewaarderMock.VerwachtMethodCall("BewaarMeegegevenKorting",..DecrypteerRequestStub.Ref,..DecrypteerRequestStub.DataOpt).ExactAantalKeer(1)
 	
 	Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(KlantDataDummy)
+	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",..LoginParameters.KlantID).DanReturn(KlantDataDummy)
 	
 	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,HandelPersonalityRepositoryStub,,,SettingsManagerStub,KortingBewaarderMock)
 	
@@ -131,7 +131,7 @@
 	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 
 	Set HandelPersonalityStub = ##class(vhTest.Mock.DOM.common.impl.HandelPersonality).%New(##class(DOM.common.enu.Personality).Destil(),$$$DummyInteger)
-	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Daro())
+	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Destil())
 	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("destil_")
 	
 	Set KlantDataDummy = ##class(DOM.common.dto.KlantData).%New()
@@ -144,7 +144,7 @@
 	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("destil_")
 
 	Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(KlantDataDummy)
+	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",..LoginParameters.KlantID).DanReturn(KlantDataDummy)
 	
 	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock,,HandelKlantDataRepository)
 	
@@ -168,7 +168,7 @@
 	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 
 	Set HandelPersonalityStub = ##class(vhTest.Mock.DOM.common.impl.HandelPersonality).%New(##class(DOM.common.enu.Personality).Kisch(),$$$DummyInteger)
-	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Daro())
+	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Kisch())
 	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("kisch")
 	
 	Set KlantDataDummy = ##class(DOM.common.dto.KlantData).%New()
@@ -181,7 +181,7 @@
 	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("kisch_")
 
 	Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(KlantDataDummy)
+	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",..LoginParameters.KlantID).DanReturn(KlantDataDummy)
 	
 	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock,,HandelKlantDataRepository)
 	
@@ -203,13 +203,32 @@
 	
 	Set LoginParameterBepalerMock = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
 	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
+
+	Set HandelPersonalityStub = ##class(vhTest.Mock.DOM.common.impl.HandelPersonality).%New(##class(DOM.common.enu.Personality).Daro(),$$$DummyInteger)
+	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Daro())
+	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("daro")
 	
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock)
+	Set KlantDataDummy = ##class(DOM.common.dto.KlantData).%New()
+	Set KlantDataDummy.ID = "5"
+	Set KlantDataDummy.Naam = $$$DummyString
+		
+	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(KlantDataDummy)
 	
+	Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
+	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro_")
+
+	Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
+	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",..LoginParameters.KlantID).DanReturn(KlantDataDummy)
+	
+	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock,,HandelKlantDataRepository)
+	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
 	
 	Do $$$AssertEquals(Response.IsGeldig,"1")
-	Do $$$AssertEquals(Response.ToegelatenLadetypes.Count(),2)
+	If $$$AssertEquals(Response.ToegelatenLadetypes.Count(),2) {
+		Do $$$AssertInList(Response.ToegelatenLadetypes,"LBX")
+		Do $$$AssertInList(Response.ToegelatenLadetypes,"TAX")
+	}
 	
 	Do LoginParameterBepalerMock.Verifieer()
 ]]></Implementation>
@@ -239,7 +258,7 @@
 	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro")
 
 	Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn("")
+	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",..LoginParameters.KlantID).DanReturn("")
 	
 	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerStub, LoggerMock,HandelKlantDataRepository)