Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml
===================================================================
diff -u -r62133 -r62942
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 62133)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 62942)
@@ -330,9 +330,11 @@
 	#dim HandelPersonality As DOM.common.impl.HandelPersonality = ..HandelPersonalityRepository.GeefViaID(LoginParameters.PersonalityID)
 	Set ..Response.KlantId = ##class(TECH.StringUtils).Replace(KlantData.ID,HandelPersonality.GeefPrefix(),"")
 	Set ..Response.KlantNaam = KlantData.Naam
-	
 	If $$$HasLength(DecrypteerRequest.DataOpt) {
 		Set ..Response.GebruikerId = $$$True
+		If $$$HasLength(LoginParameters.GebruikerID) {
+			Set ..Response.GebruikerId = $Piece(LoginParameters.GebruikerID,"_",3,$ListLength($ListFromString(LoginParameters.GebruikerID,"_")))
+		}
 	}
 	
 	Set ..Response.GebruikerNaam = ""
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml
===================================================================
diff -u -r62133 -r62942
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 62133)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 62942)
@@ -50,7 +50,7 @@
 	Set ..DecrypteerRequestStub = ##class(vhTest.Utils.WS.Vhisie4.Auth.DecrypteerRequest).StandaardDecrypteerRequest()
 	
 	Set ..LoginParameters = ##class(WSimpl.Unishop.Login.ParametersHandel).%New()
-	Set ..LoginParameters.GebruikerID = "1"
+	Set ..LoginParameters.GebruikerID = "daro_12345_1"
 	Set ..LoginParameters.KlantID = "daro_5"
 	Set ..LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Daro()
 	Set ..LoginParameters.RemoteIP = "127.0.0.257"
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/HaefeleDE.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/HaefeleDE.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/HaefeleDE.cls.xml	(revision 62942)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder.Test.HaefeleDE">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: geldig indien Ref en DataOpt voor Personality Haefele DE inclusief GebruikerID in dataopt">
+<Implementation><![CDATA[
+	#dim DecrypteerRequest As WS.Vhisie4.Auth.DecrypteerRequest = ##class(WS.Vhisie4.Auth.DecrypteerRequest).%New()
+	Set DecrypteerRequest.Hostname = "HostnameBevatHaefele-de"
+	Set DecrypteerRequest.Ref = "DummyRef"
+	Set DecrypteerRequest.DataOpt = "DummyDataOpt"
+	Set DecrypteerRequest.Header.Taal = "DummyTaal"
+	Set DecrypteerRequest.Header.GebruikerIp = "DummyGebruikerIp"
+	
+	#dim LoginParameters As WSimpl.Unishop.Login.ParametersHandel = ..GeefLoginParameters()
+	#dim ParameterBepalerMock As vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
+	Do ParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters", DecrypteerRequest.Ref, DecrypteerRequest.DataOpt, DecrypteerRequest.Header.Taal, DecrypteerRequest.Header.GebruikerIp).DanReturn(LoginParameters)
+	
+	#dim HandelPersonality As DOM.common.impl.HandelPersonality = ..GeefHandelPersonality()
+	#dim HandelPersonalityRepositoryMock As vhTest.Mock.TECH.Persistentie.Repository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
+	Do HandelPersonalityRepositoryMock.VerwachtMethodCall("GeefViaID", LoginParameters.PersonalityID).DanReturn(HandelPersonality)
+	
+	#dim KlantDataBewaarderMock As vhTest.Mock.APPS.VKP.KlantDataBewaarder = ##class(vhTest.Mock.APPS.VKP.KlantDataBewaarder).%New()
+	Do KlantDataBewaarderMock.VerwachtMethodCall("Bewaar", HandelPersonality, ..Matches.IsA("DOM.common.dto.HandelKlantData")).DanDoeNiks()
+	
+	#dim DummyToegelatenLadetypes As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("DummyLadetype1", "DummyLadetype2")
+	#dim HandelToegelatenLadetypesBepalerMock As vhTest.Mock.DOM.VKP.impl.HandelToegelatenLadetypesBepaler = ##class(vhTest.Mock.DOM.VKP.impl.HandelToegelatenLadetypesBepaler).%New()
+	Do HandelToegelatenLadetypesBepalerMock.VerwachtMethodCall("Bepaal", LoginParameters.PersonalityID).DanReturn(DummyToegelatenLadetypes)
+	
+	#dim KortingBewaarderMock As vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder = ##class(vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder).%New()
+	Do KortingBewaarderMock.VerwachtMethodCall("BewaarMeegegevenKorting", DecrypteerRequest.Ref, DecrypteerRequest.DataOpt).DanDoeNiks()
+	
+	#dim Decrypteerder As WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(ParameterBepalerMock, "", HandelPersonalityRepositoryMock, "", KortingBewaarderMock, "", HandelToegelatenLadetypesBepalerMock, KlantDataBewaarderMock)
+	#dim DecrypteerResponse As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(DecrypteerRequest)
+	
+	Do $$$AssertTrue(DecrypteerResponse.IsGeldig)
+	Do $$$AssertFalse(DecrypteerResponse.IsContactGegevensFormulierNodig)
+	Do $$$AssertFalse(DecrypteerResponse.IsLoginFormulierNodig)
+	Do $$$AssertEquals(DecrypteerResponse.PersonalityId, LoginParameters.PersonalityID)
+	Do $$$AssertEquals(DecrypteerResponse.KlantId, LoginParameters.KlantID)
+	Do $$$AssertEquals(DecrypteerResponse.KlantNaam, LoginParameters.KlantNaam)
+	Do $$$AssertEquals(DecrypteerResponse.GebruikerId, "GebruikerID")
+	Do $$$AssertEquals(DecrypteerResponse.GebruikerNaam, "")
+	Do $$$AssertEquals(DecrypteerResponse.Taal, LoginParameters.Taal)
+	Do $$$AssertEqualsList(DecrypteerResponse.ToegelatenLadetypes, DummyToegelatenLadetypes)
+	
+	Do ParameterBepalerMock.Verifieer()
+	Do HandelPersonalityRepositoryMock.Verifieer()
+	Do KlantDataBewaarderMock.Verifieer()
+	Do KortingBewaarderMock.Verifieer()
+	Do HandelToegelatenLadetypesBepalerMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="GeefLoginParameters">
+<Private>1</Private>
+<ReturnType>WSimpl.Unishop.Login.ParametersHandel</ReturnType>
+<Implementation><![CDATA[
+	#dim LoginParameters As WSimpl.Unishop.Login.ParametersHandel = ##class(WSimpl.Unishop.Login.ParametersHandel).%New()
+	
+	Set LoginParameters.PersonalityID = "DummyPersonalityId"
+	Set LoginParameters.KlantID = "DummyKlantId"
+	Set LoginParameters.KlantNaam = "DummyKlantNaam"
+	Set LoginParameters.GebruikerID = "HaefeleDE_12345_GebruikerID"
+	Set LoginParameters.Taal = ##class(DOM.enu.Taal).Duits()
+	
+	Quit LoginParameters
+]]></Implementation>
+</Method>
+
+<Method name="GeefHandelPersonality">
+<Private>1</Private>
+<ReturnType>DOM.common.impl.HandelPersonality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.HaefeleDEPersonality).Instance()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>