Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml
===================================================================
diff -u -r50839 -r50847
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 50839)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 50847)
@@ -189,24 +189,16 @@
 	#dim KlantData As DOM.common.dto.HandelKlantData
 	#dim HandelPersonality As DOM.common.impl.HandelPersonality = ..HandelPersonalityRepository.GeefViaID(LoginParameters.PersonalityID)
 	
+	Set KlantData = ..GeefHandelKlantDataDto(LoginParameters)
 	If (LoginParameters.KlantID = "") {
-		Set KlantData = ..GeefHandelKlantDataDto(LoginParameters)
 		Set KlantData.ID = HandelPersonality.GeefPrefix()_..WebshopSessionService.GeefVolgendeKlantID(HandelPersonality.GeefID())
-		Do ..KlantDataBewaarder.Bewaar(HandelPersonality, KlantData)
 	} ElseIf $$$Not(..KlantDataRepository.BestaatViaID(LoginParameters.KlantID)){
-		Set KlantData = ..GeefHandelKlantDataDto(LoginParameters)
-		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		Do ..KlantDataBewaarder.Bewaar(HandelPersonality, KlantData)
 	} Else {
-		If ##class(TECH.StringUtils).Contains(LoginParameters.KlantID,"_") {
-			Set KlantData = ..GeefHandelKlantDataDto(LoginParameters)
-			Do ..KlantDataBewaarder.Bewaar(HandelPersonality, KlantData)
-		} Else {
-			Set KlantData = ..GeefHandelKlantDataDto(LoginParameters)
+		If $$$Not(##class(TECH.StringUtils).Contains(LoginParameters.KlantID,"_")) {
 			Set KlantData.ID = HandelPersonality.GeefPrefix()_KlantData.ID
-			Do ..KlantDataBewaarder.Bewaar(HandelPersonality, KlantData)
 		}
 	}
+	Do ..KlantDataBewaarder.Bewaar(HandelPersonality, KlantData)
 	
 	Quit KlantData
 ]]></Implementation>