From a5848ab13b18f4f91a9cdd64a4c4d45286a2e1c9 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Tue, 30 Nov 2021 14:58:59 -0700
Subject: [PATCH] Use current caller ID name and number to set the Outbound
 caller ID information.

---
 .../resources/switch/conf/dialplan/505_call-forward-all.xml     | 2 ++
 1 file changed, 2 insertions(+)

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 ca85eeedbf..42129ddef3 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
@@ -5,6 +5,8 @@
 		<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="false"/>
+		<action application="set" data="outbound_caller_id_number=${caller_id_number}" inline="true" enabled="false"/>
 		<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}"/>
 	</condition>