diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl
index 3bbf34c..64d66b8 100644
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -11,7 +11,11 @@
 <#-- If you are using unreferenced actors, you will need to create a "VIZ" consignee in HARDIS WMS to use this feature -->
 <#assign defaultactor ="VIZ">
 <#if executionflow.ShipTo.ActorID?? && executionflow.ShipTo.ActorID!="">
-	<#assign actorID = "${RPtoRFXprefixConsignee(executionflow.ShipTo.ActorID)}" >
+	<#if (executionflow.ShipTo.ActorID?length gt 4) >
+		<#assign actorID = "${RPtoRFXprefixConsignee(executionflow.ShipTo.ActorID)}" >
+	<#else>
+		<#assign actorID = "${executionflow.ShipTo.ActorID}" >
+	</#if>
 <#else>
 	<#assign actorID = defaultactor >
 </#if>
@@ -22,7 +26,11 @@
 	"method" : "POST",
 	"uri_substitutions": {
 		"activity_code": "${activity_code}",
-		"physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipFrom.ActorID)}",
+		<#if (executionflow.ShipFrom.ActorID?length gt 4) >
+				"physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipFrom.ActorID)}",
+			<#else>
+				"physical_depot_code": "${executionflow.ShipFrom.ActorID}",
+		</#if>
 		"originator_code": "${originator_code}"
 	},
 	"payload" :