diff --git a/app/calls/resources/classes/call_forward.php b/app/calls/resources/classes/call_forward.php
index 7aa2718aca..688db9df73 100644
--- a/app/calls/resources/classes/call_forward.php
+++ b/app/calls/resources/classes/call_forward.php
@@ -96,10 +96,12 @@ include "root.php";
 						}
 					}
 					else{
-						$dial_string .= ",outbound_caller_id_name=".$this->outbound_caller_id_name;
-						$dial_string .= ",outbound_caller_id_number=".$this->outbound_caller_id_number;
-						$dial_string .= ",origination_caller_id_name=".$this->outbound_caller_id_name;
-						$dial_string .= ",origination_caller_id_number=".$this->outbound_caller_id_number;
+						if ($_SESSION['cdr']['follow_me_fix']['boolean'] == "true"){
+							$dial_string .= ",outbound_caller_id_name=".$this->outbound_caller_id_name;
+							$dial_string .= ",outbound_caller_id_number=".$this->outbound_caller_id_number;
+							$dial_string .= ",origination_caller_id_name=".$this->outbound_caller_id_name;
+							$dial_string .= ",origination_caller_id_number=".$this->outbound_caller_id_number;
+						}
 					}
 
 					$dial_string .= "}";
diff --git a/app/calls/resources/classes/follow_me.php b/app/calls/resources/classes/follow_me.php
index 4adeae93ac..78c25531fd 100644
--- a/app/calls/resources/classes/follow_me.php
+++ b/app/calls/resources/classes/follow_me.php
@@ -416,10 +416,15 @@ include "root.php";
 							}
 							else {
 								$dial_string .= "[";
-								$dial_string .= "outbound_caller_id_name=".$this->outbound_caller_id_name;
-								$dial_string .= ",outbound_caller_id_number=".$this->outbound_caller_id_number;
-								$dial_string .= ",origination_caller_id_name=".$this->outbound_caller_id_name;
-								$dial_string .= ",origination_caller_id_number=".$this->outbound_caller_id_number;
+								if ($_SESSION['cdr']['follow_me_fix']['boolean'] == "true"){
+									$dial_string .= "outbound_caller_id_name=".$this->outbound_caller_id_name;
+									$dial_string .= ",outbound_caller_id_number=".$this->outbound_caller_id_number;
+									$dial_string .= ",origination_caller_id_name=".$this->outbound_caller_id_name;
+									$dial_string .= ",origination_caller_id_number=".$this->outbound_caller_id_number;
+								}
+								else{
+									$dial_string .= "outbound_caller_id_number=$dial_string_caller_id_number";
+								}
 								$dial_string .= ",presence_id=".$this->extension."@".$_SESSION['domain_name'];
 								if ($row["follow_me_prompt"] == "1") {
 									$dial_string .= ",group_confirm_key=exec,group_confirm_file=lua confirm.lua,confirm=true,";