diff --git a/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml b/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml
index 9464a8457d..3d6fdbdbe5 100644
--- a/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml
@@ -1,14 +1,20 @@
 <context name="${domain_name}">
 	<extension name="call-forward-all" number="" app_uuid="57cf8f1f-9a2e-4996-bd80-d9300249b1ca" global="true" order="505">
-	<condition field="${user_exists}" expression="true"/>
-	<condition field="${forward_all_enabled}" expression="true">
-		<action application="export" data="sip_h_Diversion=&lt;sip:${caller_destination}@${external_sip_ip}:5060&gt;;reason=unconditional" inline="true" enabled="true"/>
-		<action application="set" data="outbound_caller_id_name=${user_data ${destination_number}@${domain_name} var outbound_caller_id_name}" inline="true" enabled="false"/>
-		<action application="set" data="outbound_caller_id_number=${user_data ${destination_number}@${domain_name} var outbound_caller_id_number}" inline="true" enabled="false"/>
-		<action application="set" data="outbound_caller_id_name=${caller_id_name}" inline="true" enabled="true"/>
-		<action application="set" data="outbound_caller_id_number=${caller_id_number}" inline="true" enabled="true"/>
-		<action application="set" data="accountcode=${user_data ${destination_number}@${domain_name} var accountcode}" inline="true" enabled="false"/>
-		<action application="transfer" data="${forward_all_destination} XML ${domain_name}" enabled="true"/>
-	</condition>
+	    <condition field="${user_exists}" expression="true"/>
+	    <condition field="${forward_all_enabled}" expression="true">
+	        <action application="export" data="sip_h_Diversion=&lt;sip:${caller_destination}@${external_sip_ip}:5060&gt;;reason=unconditional" inline="true"/>
+	    </condition>
+	    <condition field="${call_direction}" expression="^local$" break="on-true">
+	        <action application="set" data="outbound_caller_id_name=${user_data ${destination_number}@${domain_name} var outbound_caller_id_name}" inline="true"/>
+	        <action application="set" data="outbound_caller_id_number=${user_data ${destination_number}@${domain_name} var outbound_caller_id_number}" inline="true"/>
+	        <action application="set" data="accountcode=${user_data ${destination_number}@${domain_name} var accountcode}" inline="true"/>
+	        <action application="transfer" data="${forward_all_destination} XML ${domain_name}"/>
+	    </condition>
+	    <condition field="${call_direction}" expression="inbound" break="on-true">
+	        <action application="set" data="outbound_caller_id_name=${caller_id_name}" inline="true"/>
+	        <action application="set" data="outbound_caller_id_number=${caller_id_number}" inline="true"/>
+	        <action application="set" data="accountcode=${user_data ${destination_number}@${domain_name} var accountcode}" inline="true"/>
+	        <action application="transfer" data="${forward_all_destination} XML ${domain_name}"/>
+	    </condition>
 	</extension>
 </context>