Index: vhUnitTest/AXimpl/Utils/KlantIdConverter/Test.cls.xml
===================================================================
diff -u -r50885 -r51147
--- vhUnitTest/AXimpl/Utils/KlantIdConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 50885)
+++ vhUnitTest/AXimpl/Utils/KlantIdConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 51147)
@@ -3,11 +3,6 @@
 <Class name="vhUnitTest.AXimpl.Utils.KlantIdConverter.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="OrigineleConfigSetting">
-<Type>%Boolean</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="KlantIdConverter">
 <Type>AXimpl.Utils.KlantIdConverter</Type>
 <Private>1</Private>
@@ -27,21 +22,12 @@
 <Implementation><![CDATA[
 	Do ##super()
 
-	Set ..OrigineleConfigSetting = ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A")
 	Set ..KlantIdConverter = ##class(AXimpl.Utils.KlantIdConverter).%New()
 	Set ..VanHoeckePersonality = ##class(DOM.common.enu.Personality).VanHoecke()
 	Set ..NietVanHoeckePersonality = ##class(DOM.common.enu.Personality).SFS()
 ]]></Implementation>
 </Method>
 
-<Method name="OnAfterAllTests">
-<Implementation><![CDATA[
-	Do ##super()
-	
-	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("KlantIdAx2A", ..OrigineleConfigSetting, ..#Applicatie)
-]]></Implementation>
-</Method>
-
 <Method name="Test: ConvertToVanHoecke converteert een AX KlantId naar een Van Hoecke KlantId">
 <Implementation><![CDATA[
 	Do ..AssertVanHoeckeKlantId("00123", ..VanHoeckePersonality, "123")
@@ -59,6 +45,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: ConvertToAx roept LegacyPartijApi aan bij VanHoecke personality">
+<Implementation><![CDATA[
+	#dim RandomPartijId As %String = "K||123"
+	#dim RandomKlantId As %String = "123"
+	
+	#dim LegacyPartijApiMock As vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
+	Do LegacyPartijApiMock.VerwachtMethodCall("IsKlantPartijID", RandomPartijId).DanReturn($$$True)
+	Do LegacyPartijApiMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID", RandomPartijId).DanReturn(RandomKlantId)
+	
+	#dim KlantIdConverter As AXimpl.Utils.KlantIdConverter = ##class(AXimpl.Utils.KlantIdConverter).%New(LegacyPartijApiMock)
+	#dim AxKlantId As %String = KlantIdConverter.ConvertToAx(RandomPartijId, ..VanHoeckePersonality)
+	
+	Do $$$AssertEquals(AxKlantId, "00123")
+	
+	Do LegacyPartijApiMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="AssertVanHoeckeKlantId">
 <FormalSpec>KlantId:%String,PersonalityId:%String,VerwachteKlantId:%String</FormalSpec>
 <Private>1</Private>
Index: AXimpl/Utils/KlantIdConverter.cls.xml
===================================================================
diff -u -r50885 -r51147
--- AXimpl/Utils/KlantIdConverter.cls.xml	(.../KlantIdConverter.cls.xml)	(revision 50885)
+++ AXimpl/Utils/KlantIdConverter.cls.xml	(.../KlantIdConverter.cls.xml)	(revision 51147)
@@ -3,6 +3,24 @@
 <Class name="AXimpl.Utils.KlantIdConverter">
 <Super>TECH.Mockable</Super>
 
+<Property name="LegacyPartijApi">
+<Type>DOM.PARTIJ.impl.LegacyPartijAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>LegacyPartijApi:DOM.PARTIJ.impl.LegacyPartijAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..LegacyPartijApi = $$$Inject(LegacyPartijApi, ##class(DOM.PARTIJ.impl.LegacyPartijAPI).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="ConvertToVanHoecke">
 <FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
@@ -20,12 +38,11 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke()) {
-		If ##class(TECH.StringUtils).StartsWith(KlantId, "K||") {
-			Set KlantId = ##class(TECH.StringUtils).AlignRight($extract(KlantId, 4, *), 0, 5)
-		} Else {
-			Set KlantId = ##class(TECH.StringUtils).AlignRight(+KlantId, 0, 5)
+		If (..LegacyPartijApi.IsKlantPartijID(KlantId)) {
+			Set KlantId = ..LegacyPartijApi.GeefKlantNummerVoorPartijID(KlantId)
 		}
-
+		
+		Set KlantId = ##class(TECH.StringUtils).AlignRight(+KlantId, 0, 5)
 	}
 	
 	Quit KlantId