Index: vhTest/Fake/DOM/VKP/LeverAdres.cls.xml
===================================================================
diff -u -r38113 -r38127
--- vhTest/Fake/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 38113)
+++ vhTest/Fake/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 38127)
@@ -75,7 +75,7 @@
 
 <Method name="GeefKlantId">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "Klant "_..ID
+<Implementation><![CDATA[	Quit "K||100"_..ID
 ]]></Implementation>
 </Method>
 
Index: AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml
===================================================================
diff -u -r38113 -r38127
--- AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38113)
+++ AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38127)
@@ -43,7 +43,7 @@
 	#dim Adres As DOM.VKP.impl.LeverAdres = ..LeveradresRepository.GeefViaID(Command.SubjectId)
 	
 	Set ..Address.Straat1 = Adres.GeefStraat()
-	Set ..Address.Klantnummer = Adres.GeefKlantId()
+	Set ..Address.Klantnummer = ##class(AX.common.impl.ConvertAdminToAX).ConvertCustomerID(Adres.GeefKlantId())
 	Set ..Address.Postcode = Adres.GeefPostcode()
 	Set ..Address.Plaats = Adres.GeefGemeente()
 	Set ..Address.LandCodeISO3 = Adres.GeefLand().GeefIso3()
Index: vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml
===================================================================
diff -u -r38113 -r38127
--- vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 38113)
+++ vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 38127)
@@ -33,7 +33,7 @@
 <Method name="Test: properties die 1 op 1 worden overgenomen">
 <Implementation><![CDATA[
 	#dim GeconverteerdeLeverAdres As AXBizTalk.Crm.Address.Upsert.Address = ..GeefAddress(..Leveradres.GeefID())
-	Do $$$AssertEquals(GeconverteerdeLeverAdres.Klantnummer,"Klant 1")
+	Do $$$AssertEquals(GeconverteerdeLeverAdres.Klantnummer,"01001")
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.Straat1,"Straat 1")
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.Postcode,"9101")
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.Plaats,"Gemeente 1")