Index: WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml
===================================================================
diff -u -r49250 -r49294
--- WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml	(.../KlantDocumentService.cls.xml)	(revision 49250)
+++ WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml	(.../KlantDocumentService.cls.xml)	(revision 49294)
@@ -63,7 +63,6 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	do ##super()
 	Set ..HeaderValidator = ##class(WSimpl.Vhisie4.HeaderValidator).%New()
 	Set ..SessionManager = ##class(WSimpl.Vhisie4.SessionManager).%New()
 	Set ..KlantIdConverter = ##class(WSimpl.Vhisie4.KlantIdConverter).%New()
@@ -270,18 +269,21 @@
 <ReturnType>WS.Vhisie4.KlantDocument.GeefDocumentResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set Request.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(Request.Header.KlantId)
+	If ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") {
+		Set Request.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(Request.Header.KlantId)
+	}
+	;Do ..HeaderValidator.ValidateHeader(Request.Header)
+	;Do ..Logger.Debug("GeefDocument - ValidateHeader ok", Request.DocumentId)
+	;Do ..SessionManager.RegisterSession(Request.Header)
+	;Do ..Logger.Debug("GeefDocument - RegisterSession ok", Request.DocumentId)
 	
-	Do ..Logger.Debug("GeefDocument", Request.DocumentId)
-	Do ..HeaderValidator.ValidateHeader(Request.Header)
-	Do ..Logger.Debug("GeefDocument - ValidateHeader ok", Request.DocumentId)
-	Do ..SessionManager.RegisterSession(Request.Header)
-	Do ..Logger.Debug("GeefDocument - RegisterSession ok", Request.DocumentId)
-	
 	#dim Response As WS.Vhisie4.KlantDocument.GeefDocumentResponse
 
 	Set Response = ##class(AX.Uitgaand.EC.Data.impl.DocumentOphalen).%New(Request).GeefResponse()
-	Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response)
+	If ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") {
+
+		Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response)
+	}
 	Quit Response
 ]]></Implementation>
 </Method>