Index: vhTest/Utils/DOM/VKP/Order.cls.xml
===================================================================
diff -u -r53113 -r53123
--- vhTest/Utils/DOM/VKP/Order.cls.xml	(.../Order.cls.xml)	(revision 53113)
+++ vhTest/Utils/DOM/VKP/Order.cls.xml	(.../Order.cls.xml)	(revision 53123)
@@ -30,8 +30,8 @@
 	Do Order.IndienMethodCall("GeefOorsprongKetting").DanReturn("OorsprongKetting")
 	Do Order.IndienMethodCall("GeefEDINummer").DanReturn("EDINummer")
 	Do Order.IndienMethodCall("GeefEindPersonality").DanReturn(##class(DOM.common.VanHoeckePersonality).Instance())
-	Do Order.IndienMethodCall("GeefEmailAdresBesteller").DanReturn("EmailAdresBesteller")
-	Do Order.IndienMethodCall("GeefEmailAdresBevestiging").DanReturn("EmailAdresBevestiging")
+	Do Order.IndienMethodCall("GeefEmailAdresBesteller").DanReturn("EmailAdresBesteller@vanhoecke.be")
+	Do Order.IndienMethodCall("GeefEmailAdresBevestiging").DanReturn("EmailAdresBevestiging@vanhoecke.be")
 
 	Quit Order
 ]]></Implementation>
Index: vhTestFiles/UnitTests/AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder/Test/TestBelgischLeverAdres/Result.xml
===================================================================
diff -u -r53116 -r53123
--- vhTestFiles/UnitTests/AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder/Test/TestBelgischLeverAdres/Result.xml	(.../Result.xml)	(revision 53116)
+++ vhTestFiles/UnitTests/AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder/Test/TestBelgischLeverAdres/Result.xml	(.../Result.xml)	(revision 53123)
@@ -14,9 +14,9 @@
   <LocationId>AXLeveradresId</LocationId>
   <MessageId>MessageId</MessageId>
   <MultiPersonalityLinkContainer>OorsprongKetting</MultiPersonalityLinkContainer>
-  <OrderedByEmail>EmailAdresBesteller</OrderedByEmail>
+  <OrderedByEmail>EmailAdresBesteller@vanhoecke.be</OrderedByEmail>
   <PurchOrderFormNum>OrderReferentie</PurchOrderFormNum>
   <RefSalesOriginId>EDINummer</RefSalesOriginId>
-  <SalesConfirmEmail>EmailAdresBevestiging</SalesConfirmEmail>
+  <SalesConfirmEmail>EmailAdresBevestiging@vanhoecke.be</SalesConfirmEmail>
   <SalesIdAX>AXSalesId</SalesIdAX>
 </AxdEntity_OrderHeader>
\ No newline at end of file
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml
===================================================================
diff -u -r53116 -r53123
--- vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml	(.../Test.cls.xml)	(revision 53116)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml	(.../Test.cls.xml)	(revision 53123)
@@ -29,8 +29,8 @@
 	do $$$AssertEquals(OrderHeader.SalesIdAX,"AXSalesId")
 	do $$$AssertEquals(OrderHeader.class,"entity")
 	do $$$AssertEquals(OrderHeader.MessageId,"MessageId")
-	do $$$AssertEquals(OrderHeader.OrderedByEmail,"EmailAdresBesteller")
-	do $$$AssertEquals(OrderHeader.SalesConfirmEmail,"EmailAdresBevestiging")
+	do $$$AssertEquals(OrderHeader.OrderedByEmail,"EmailAdresBesteller@vanhoecke.be")
+	do $$$AssertEquals(OrderHeader.SalesConfirmEmail,"EmailAdresBevestiging@vanhoecke.be")
 	
 	Do $$$AssertEquals(OrderHeader.SalesOriginId,"")
 	Do $$$AssertEquals(OrderHeader.RefSalesOriginId,"EDINummer")
Index: AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml
===================================================================
diff -u -r53116 -r53123
--- AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(.../OrderHoofdingConverteerder.cls.xml)	(revision 53116)
+++ AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(.../OrderHoofdingConverteerder.cls.xml)	(revision 53123)
@@ -39,8 +39,8 @@
 	Set OrderHeader.InvoiceAccount = OrderHeader.CustAccount
 	Set OrderHeader.ReceiptDateRequested = ..GeefLeverDatumVanOrder(Order)
 	Set OrderHeader.SalesIdAX = Order.GeefAxSalesId()
-	Set OrderHeader.OrderedByEmail = Order.GeefEmailAdresBesteller()
-	Set OrderHeader.SalesConfirmEmail = Order.GeefEmailAdresBevestiging()
+	Set OrderHeader.OrderedByEmail = $$$If(##class(TECH.MailUtils).Check(Order.GeefEmailAdresBesteller()),Order.GeefEmailAdresBesteller(),"")
+	Set OrderHeader.SalesConfirmEmail = $$$If(##class(TECH.MailUtils).Check(Order.GeefEmailAdresBevestiging()),Order.GeefEmailAdresBevestiging(),"")
 	
 	Set OrderHeader.SalesOriginId = ##class(AXimpl.AdminToAxUtils).ConvertOrigin(Order.GeefOorsprong())
 	Set OrderHeader.RefSalesOriginId = Order.GeefEDINummer()