Index: AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml
===================================================================
diff -u -r35618 -r35626
--- AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 35618)
+++ AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 35626)
@@ -188,30 +188,33 @@
 <Private>1</Private>
 <ReturnType>AXaif.Customer.AxdEntityDirPartyPostalAddressView</ReturnType>
 <Implementation><![CDATA[
+	#dim Adres As DOM.common.Adres = Partij.GeefAdres()
+	
 	set PostalAddres = ##class(AXaif.Customer.AxdEntityDirPartyPostalAddressView).%New()
 	set PostalAddres.class = "entity"
-	#dim Adres As DOM.common.Adres = Partij.GeefAdres()
 	set PostalAddres.City = $$$UCase(Adres.GeefGemeente())
 	set PostalAddres.IsPrimary = ##class(AXaif.Customer.AxdExtTypeLogisticsIsPrimaryAddress).Yes()
 	set PostalAddres.Roles = "Business"
 	set PostalAddres.CountryRegionId = Adres.GeefLand().GeefIso3()
 	set PostalAddres.Street = Adres.GeefStraat()
 	set PostalAddres.ZipCode = ##class(DOM.common.impl.AdresUtils).CorrigeerPostcode(Adres.GeefPostcode(),Adres.GeefLandNr())	
 	set PostalAddres.LocationName = DirParty.Name
-	Do DirParty.DirPartyPostalAddressView.Insert(PostalAddres)
 	
 	If $$$Not(..IsLandCodeInAdresGelijkAanLandInBTWnummer(Partij) || (##class(TECH.StringUtils).Equals(Partij.GeefBTWNr(),"GEEN","G",""))) {
+		
+		Set PostalAddres.IsPrimary = ##class(AXaif.Customer.AxdExtTypeLogisticsIsPrimaryAddress).No()
+		
 		#dim FictiefPostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView
 		Set FictiefPostalAddres = ##class(AXaif.Customer.AxdEntityDirPartyPostalAddressView).%New()	
 		Set FictiefPostalAddres.class = "entity"	
 		Set FictiefPostalAddres.IsPrimary = ##class(AXaif.Customer.AxdExtTypeLogisticsIsPrimaryAddress).Yes()		
 		Set FictiefPostalAddres.CountryRegionId = ..LandRepository.GeefViaLandCode2Lang(..LandCodeUitBTWNummer(Partij.GeefBTWNr())).GeefIso3()
 		Set FictiefPostalAddres.Roles = "Business"
 		Set FictiefPostalAddres.LocationName = DirParty.Name
-		Set PostalAddres.LocationName = DirParty.Name
-		Set PostalAddres.IsPrimary = ##class(AXaif.Customer.AxdExtTypeLogisticsIsPrimaryAddress).No()
 		Do DirParty.DirPartyPostalAddressView.InsertAt(FictiefPostalAddres,1)
 	}
+	
+	Do DirParty.DirPartyPostalAddressView.Insert(PostalAddres)
 ]]></Implementation>
 </Method>