diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php
index 33934c39dd..dad61a64c3 100644
--- a/app/calls/call_edit.php
+++ b/app/calls/call_edit.php
@@ -536,7 +536,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	if (permission_exists('follow_me_cid_set')) {
 		echo "   ";
-		$sql_forward = "select destination_uuid, destination_number, destination_description from v_destinations where domain_uuid = '$domain_uuid' and destination_type = 'inbound' order by destination_number asc ";
+		$sql_forward = "select destination_uuid, destination_number, destination_description, destination_caller_id_number, destination_caller_id_name from v_destinations where domain_uuid = '$domain_uuid' and destination_type = 'inbound' order by destination_number asc ";
 		$prep_statement_forward = $db->prepare(check_sql($sql_forward));
 		$prep_statement_forward->execute();
 		$result_forward = $prep_statement_forward->fetchAll(PDO::FETCH_ASSOC);
@@ -546,7 +546,15 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "  <option value='' disabled='disabled'></option>\n";
 			foreach ($result_forward as &$row_forward) {
 				$selected = $row_forward["destination_uuid"] == $forward_caller_id_uuid ? "selected='selected' " : '';
-				echo "<option value='".$row_forward["destination_uuid"]."' ".$selected.">".format_phone($row_forward["destination_number"])." : ".$row_forward["destination_description"]."</option>\n";
+				$caller_id_number = $row_forward['destination_caller_id_number'];
+				if(strlen($caller_id_number) == 0){
+					$caller_id_number = $row_forward['destination_number'];
+				}
+				$caller_id_name = $row_forward['destination_caller_id_name'];
+				if(strlen($caller_id_name) == 0){
+					$caller_id_name = $row_forward['destination_description'];
+				}
+				echo "<option value='".$row_forward["destination_uuid"]."' ".$selected.">".format_phone($caller_id_number)." : ".$caller_id_name."</option>\n";
 			}
 			echo "</select>\n";
 		}
diff --git a/app/calls/resources/classes/call_forward.php b/app/calls/resources/classes/call_forward.php
index 3825ec3304..2886856180 100644
--- a/app/calls/resources/classes/call_forward.php
+++ b/app/calls/resources/classes/call_forward.php
@@ -84,17 +84,27 @@ include "root.php";
 					}
 
 					if (strlen($this->forward_caller_id_uuid) > 0){
-						$sql_caller = "select destination_number, destination_description from v_destinations where domain_uuid = '$this->domain_uuid' and destination_type = 'inbound' and destination_uuid = '$this->forward_caller_id_uuid'";
+						$sql_caller = "select destination_number, destination_description, destination_caller_id_number, destination_caller_id_name from v_destinations where domain_uuid = '$this->domain_uuid' and destination_type = 'inbound' and destination_uuid = '$this->forward_caller_id_uuid'";
 						$prep_statement_caller = $db->prepare($sql_caller);
 						if ($prep_statement_caller) {
 							$prep_statement_caller->execute();
 							$row_caller = $prep_statement_caller->fetch(PDO::FETCH_ASSOC);
-							if (strlen($row_caller['destination_description']) > 0) {
-								$dial_string_caller_id_name = $row_caller['destination_description'];
+
+							$caller_id_number = $row_caller['destination_caller_id_number'];
+							if(strlen($caller_id_number) == 0){
+								$caller_id_number = $row_caller['destination_number'];
+							}
+							$caller_id_name = $row_caller['destination_caller_id_name'];
+							if(strlen($caller_id_name) == 0){
+								$caller_id_name = $row_caller['destination_description'];
+							}
+
+							if (strlen($caller_id_name) > 0) {
+								$dial_string_caller_id_name = $caller_id_name;
 								$dial_string .= ",origination_caller_id_name=$dial_string_caller_id_name";
 							}
-							if (strlen($row_caller['destination_number']) > 0) {
-								$dial_string_caller_id_number = $row_caller['destination_number'];
+							if (strlen($caller_id_number) > 0) {
+								$dial_string_caller_id_number = $caller_id_number;
 								$dial_string .= ",origination_caller_id_number=$dial_string_caller_id_number";
 								$dial_string .= ",outbound_caller_id_number=$dial_string_caller_id_number";
 							}