Index: WSimpl/Vhisie4/HeaderValidator.cls.xml
===================================================================
diff -u -r41446 -r41609
--- WSimpl/Vhisie4/HeaderValidator.cls.xml	(.../HeaderValidator.cls.xml)	(revision 41446)
+++ WSimpl/Vhisie4/HeaderValidator.cls.xml	(.../HeaderValidator.cls.xml)	(revision 41609)
@@ -23,18 +23,20 @@
 <Method name="ValidateHeader">
 <FormalSpec>Header:WS.Vhisie4.RequestHeader</FormalSpec>
 <Implementation><![CDATA[
-	Do ..ValidateKlant(Header.KlantId)
+	Do ..ValidateKlant(Header)
 	;Do ..ValidatePersonality(Header.PersonalityId)
 ]]></Implementation>
 </Method>
 
 <Method name="ValidateKlant">
-<FormalSpec>KlantId:%String</FormalSpec>
+<FormalSpec>Header:WS.Vhisie4.RequestHeader</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim VanHoeckeKlantId As %String = "K||"_KlantId
-	If $$$Not(..VerkoopApi.BestaatKlant(VanHoeckeKlantId)) {
-		do ##class(TECH.Exceptions.InvalidInputException).Throw("Klant met id '"_KlantId_"' bestaat niet")	
+	If ((Header.PersonalityId = "") || (Header.PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke())) {
+		#dim VanHoeckeKlantId As %String = "K||"_Header.KlantId
+		If $$$Not(..VerkoopApi.BestaatKlant(VanHoeckeKlantId)) {
+			do ##class(TECH.Exceptions.InvalidInputException).Throw("Klant met id '"_Header.KlantId_"' bestaat niet")	
+		}
 	}
 ]]></Implementation>
 </Method>
Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/MaakWinkelkar/Test.cls.xml
===================================================================
diff -u -r40874 -r41609
--- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/MaakWinkelkar/Test.cls.xml	(.../Test.cls.xml)	(revision 40874)
+++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/MaakWinkelkar/Test.cls.xml	(.../Test.cls.xml)	(revision 41609)
@@ -57,7 +57,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Maakwinkelkar zonder vanhoecke personality maakt winkelkar met personality vanhoecke">
+<Method name="Test: Maakwinkelkar zonder personality maakt winkelkar met personality vanhoecke">
 <Implementation><![CDATA[
 	#dim DummyKlant As %String = "0"
 	#dim DummyKlantId As %String = "K||0"
@@ -76,6 +76,34 @@
 	#dim Request As WS.Vhisie4.Winkelkar.MaakWinkelkarRequest = ##class(vhTest.Utils.WS.Vhisie4.Winkelkar.MaakWinkelkarRequest).MaakWinkelkarRequest()
 	set Request.WinkelkarId = "WinkelkarId"
 	Set Request.Header.KlantId = DummyKlantId
+	Set Request.Header.PersonalityId = ""
+	
+	Do Service.MaakWinkelkar(Request)
+	
+	Do LegacyPartijAPIMock.Verifieer()
+	Do VerkoopServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Maakwinkelkar gebruikt personality indien ingevuld">
+<Implementation><![CDATA[
+	#dim DummyKlant As %String = "0"
+	#dim DummyKlantId As %String = "0"
+	
+	Set VerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
+	Do VerkoopServiceMock.VerwachtMethodCall("MaakOfferte","destil_"_DummyKlantId,##class(DOM.common.enu.Personality).Destil(), "WinkelkarId").DanDoeNiks()
+
+	Set LegacyPartijAPIMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
+	Do LegacyPartijAPIMock.VerwachtMethodCall("IsKlantPartijID",DummyKlantId).ExactAantalKeer(0)
+	
+	Set WinkelkarRepository = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarRepository).%New()
+	Do WinkelkarRepository.IndienMethodCall("BestaatViaID",$$$ElkeWaarde).DanReturn($$$false)
+
+	Set Service = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.MaakWinkelkar).%New(VerkoopServiceMock, LegacyPartijAPIMock, WinkelkarRepository)
+	
+	#dim Request As WS.Vhisie4.Winkelkar.MaakWinkelkarRequest = ##class(vhTest.Utils.WS.Vhisie4.Winkelkar.MaakWinkelkarRequest).MaakWinkelkarRequest()
+	set Request.WinkelkarId = "WinkelkarId"
+	Set Request.Header.KlantId = DummyKlantId
 	Set Request.Header.PersonalityId = ##class(DOM.common.enu.Personality).Destil()
 	
 	Do Service.MaakWinkelkar(Request)
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/MaakWinkelkar.cls.xml
===================================================================
diff -u -r39524 -r41609
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/MaakWinkelkar.cls.xml	(.../MaakWinkelkar.cls.xml)	(revision 39524)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/MaakWinkelkar.cls.xml	(.../MaakWinkelkar.cls.xml)	(revision 41609)
@@ -36,17 +36,22 @@
 <FormalSpec>MaakWinkelkarRequest:WS.Vhisie4.Winkelkar.MaakWinkelkarRequest</FormalSpec>
 <Implementation><![CDATA[
 	Do:(..WinkelkarRepository.BestaatViaID(MaakWinkelkarRequest.WinkelkarId)) ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Winkelkar met id '"_MaakWinkelkarRequest.WinkelkarId _"' bestaat reeds."))
-	Do ..VerkoopService.MaakOfferte(..GeefKlantPartijID(MaakWinkelkarRequest.Header.KlantId), ##class(DOM.common.enu.Personality).VanHoecke(), MaakWinkelkarRequest.WinkelkarId)
+	Do ..VerkoopService.MaakOfferte(..GeefKlantPartijID(MaakWinkelkarRequest.Header.KlantId, MaakWinkelkarRequest.Header.PersonalityId), $$$If(+MaakWinkelkarRequest.Header.PersonalityId=0,##class(DOM.common.enu.Personality).VanHoecke(),MaakWinkelkarRequest.Header.PersonalityId), MaakWinkelkarRequest.WinkelkarId)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefKlantPartijID">
-<FormalSpec>KlantID:%String</FormalSpec>
+<FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>DOM.VKP.VanHoeckeKlantID</ReturnType>
 <Implementation><![CDATA[
-	Quit:..LegacyPartijAPI.IsKlantPartijID(KlantID) KlantID	
-	Quit ..LegacyPartijAPI.GeefKlantPartijID(KlantID)
+	If ((PersonalityId = "") || (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke())) {
+		Quit:..LegacyPartijAPI.IsKlantPartijID(KlantId) KlantId	
+		Quit ..LegacyPartijAPI.GeefKlantPartijID(KlantId)
+	} Else {
+		#dim HandelPersonality As DOM.common.impl.HandelPersonality = ##class(DOM.common.impl.HandelPersonality).%OpenId(PersonalityId)
+		Quit HandelPersonality.GeefPrefix()_KlantId
+	}
 ]]></Implementation>
 </Method>
 </Class>