Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/RegistreerContactGegevens/Test.cls.xml
===================================================================
diff -u -r41819 -r41837
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/RegistreerContactGegevens/Test.cls.xml	(.../Test.cls.xml)	(revision 41819)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/RegistreerContactGegevens/Test.cls.xml	(.../Test.cls.xml)	(revision 41837)
@@ -59,6 +59,7 @@
 	Do HandelPersonalityStub.IndienMethodCall("GeefWebshopVerwerker").DanReturn("")
 	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn("5")
 	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("daro_")
+	Do HandelPersonalityStub.IndienMethodCall("Accept",$$$ElkeWaarde).DanDoeNiks()
 	
 	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
 	Do HandelPersonalityRepositoryStub.VerwachtMethodCall("GeefViaID",RegistreerContactGegevensRequestStub.Header.PersonalityId).DanReturn(HandelPersonalityStub)
@@ -69,7 +70,11 @@
 	Set KlantDataBewaarderStub = ##class(vhTest.Mock.APPS.VKP.KlantDataBewaarder).%New()
 	Do KlantDataBewaarderStub.IndienMethodCall("Bewaar",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
 	
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(,,HandelKlantDataRepositoryMock,HandelPersonalityRepositoryStub,WebshopSessionServiceStub,KlantDataBewaarderStub)
+	Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
+	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro_")
+	Do SettingsManagerStub.IndienMethodCall("GeefWebshopVerwerker",HandelPersonalityStub).DanReturn("DARO")
+	
+	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(,,HandelKlantDataRepositoryMock,HandelPersonalityRepositoryStub,WebshopSessionServiceStub,KlantDataBewaarderStub,SettingsManagerStub)
 	#dim Response As WS.Vhisie4.Auth.RegistreerContactGegevensResponse = Authenticator.RegistreerContactGegevens(RegistreerContactGegevensRequestStub)
 	
 	Do HandelKlantDataRepositoryMock.Verifieer()
@@ -85,6 +90,7 @@
 	Do HandelPersonalityStub.IndienMethodCall("GeefWebshopVerwerker").DanReturn("")
 	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn("10")
 	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("daro_")
+	Do HandelPersonalityStub.IndienMethodCall("Accept",$$$ElkeWaarde).DanDoeNiks()
 	
 	#dim HandelKlantDataDummy As DOM.VKP.impl.HandelKlantData = ##class(vhTest.Utils.DOM.VKP.HandelKlantData).StandaardHandelKlantData()
 	Set HandelKlantDataRepositoryMock = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
Index: WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml
===================================================================
diff -u -r41827 -r41837
--- WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 41827)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 41837)
@@ -152,7 +152,7 @@
 		Set Response.GebruikerId = 1
 		Set Response.GebruikerNaam = ""
 		Set Response.KlantNaam = KlantData.Naam
-		Set Response.DataOpt = ##class(vhPowerTools.APPS.EC.KlantSessieDataGeneratorUnishop).%New().GenereerDataOpt(HandelPersonality.GeefWebshopVerwerker(),Response.KlantId,Response.KlantNaam,Response.GebruikerId)
+		Set Response.DataOpt = ##class(vhPowerTools.APPS.EC.KlantSessieDataGeneratorUnishop).%New().GenereerDataOpt(..SettingsManager.GeefWebshopVerwerker(HandelPersonality),Response.KlantId,Response.KlantNaam,Response.GebruikerId)
 	}
 	
 	Quit Response