diff --git a/app/dialplans/resources/switch/conf/dialplan/890_local_extension.xml b/app/dialplans/resources/switch/conf/dialplan/890_local_extension.xml
index 0f0b628eb7..acd06604e7 100644
--- a/app/dialplans/resources/switch/conf/dialplan/890_local_extension.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/890_local_extension.xml
@@ -10,6 +10,7 @@
 			<action application="set" data="hangup_after_bridge=true"/>
 			<!--<action application="set" data="continue_on_fail=NORMAL_TEMPORARY_FAILURE,USER_BUSY,NO_ANSWER,TIMEOUT,NO_ROUTE_DESTINATION"/> -->
 			<action application="set" data="continue_on_fail=true"/>
+			<action application="set" data="initial_callee_id_name=${user_data(${dialed_extension}@${domain_name} var effective_caller_id_name)}"/>
 			<action application="hash" data="insert/${domain_name}-call_return/${dialed_extension}/${caller_id_number}"/>
 			<action application="hash" data="insert/${domain_name}-last_dial_ext/${dialed_extension}/${uuid}"/>
 			<action application="set" data="called_party_call_group=${user_data(${dialed_extension}@${domain_name} var call_group)}"/>
diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php
index fc5cf8220e..cb9d4668e7 100644
--- a/app/yealink/app_config.php
+++ b/app/yealink/app_config.php
@@ -231,6 +231,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "The type of SIP header(s) to carry the caller ID; 0-FROM, 1-PAI 2-PAI-FROM (default), 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM, 6-Preference";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "0767daa9-9a7d-4949-86e4-63a779f750e0";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_cp_source";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the type of SIP header(s) to display on the caller's LCD screen; 0-RPID-FROM, 1-Dialed Digits(default), 2-RFC4916";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ba0ebf59-6364-47b2-9a98-73430669a4c4";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_dtmf_type";
@@ -1571,4 +1579,4 @@
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Options: 0-Name+Number, 1-Number+Name, 2-Name, 3-Number, 4-Full Contact, 5-Null";	
 		$y++;
 
-?>
+?>
\ No newline at end of file