Index: vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml
===================================================================
diff -u -r38127 -r38266
--- vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 38127)
+++ vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 38266)
@@ -44,6 +44,7 @@
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.BezoekAdres,$$$False)
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.ToonzaalAdres,$$$False)
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.FacturatieAdres,$$$False)
+	Do $$$AssertEquals(GeconverteerdeLeverAdres.LeveradresId,..Leveradres.GeefID())
 ]]></Implementation>
 </Method>
 
Index: AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml
===================================================================
diff -u -r38127 -r38266
--- AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38127)
+++ AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38266)
@@ -58,6 +58,7 @@
 	} Else {
 		Set ..Address.LeveringAdres = $$$True
 	}
+	Set ..Address.LeveradresId = Command.SubjectId
 		
 	Set MessageParts = ##class(AXBizTalk.Crm.Address.Upsert.MessageParts).%New()
 	Set MessageParts.Address = ..Address