diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
index 10ce9e5..4288f80 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -26,7 +26,12 @@
 
       "ShipFrom":
       {
-      "ActorID": "${receipt.original_code?trim?json_string}"
+        <#if uniqueness?? && uniqueness!="" >
+        "ActorID": "${receipt.original_code?trim?json_string}"
+      <#else>
+        "ActorID": "${prefixsupplier}${receipt.original_code?trim?json_string}"
+      </#if>
+
       },
         "ShipTo"  :
       {