diff --git a/app/calls/resources/classes/switch_follow_me.php b/app/calls/resources/classes/switch_follow_me.php
index 2265101a26..e21ee5d222 100644
--- a/app/calls/resources/classes/switch_follow_me.php
+++ b/app/calls/resources/classes/switch_follow_me.php
@@ -270,45 +270,51 @@ include "root.php";
 				if (count($result) > 0) {
 					foreach ($result as &$row) {
 						//$cid_name_prefix = $row["cid_name_prefix"];
+						$follow_me_uuid = $row["follow_me_uuid"];
 						$this->call_prompt = $row["call_prompt"];
 					}
 				}
 				unset ($prep_statement);
 
-			//update the extension
+			//is follow me enabled
 				if ($this->follow_me_enabled == "true") {
-					$sql = "select * from v_follow_me_destinations ";
-					$sql .= "where follow_me_uuid = '".$this->follow_me_uuid."' ";
-					$sql .= "order by follow_me_order asc ";
-					$prep_statement_2 = $db->prepare(check_sql($sql));
-					$prep_statement_2->execute();
-					$result = $prep_statement_2->fetchAll(PDO::FETCH_NAMED);
-					$dial_string = "{instant_ringback=true,ignore_early_media=true,sip_invite_domain=".$_SESSION['domain_name'];
-					if ($this->call_prompt == "true") {
-						$dial_string .= ",group_confirm_key=exec,group_confirm_file=lua confirm.lua";
-					}
-					//if (strlen($this->cid_name_prefix) > 0) {
-					//	$dial_string .= ",effective_caller_id_name=".$this->cid_name_prefix."#123";
-					//}
-					$dial_string .= "}";
-					foreach ($result as &$row) {
-						$dial_string .= "[presence_id=".$row["follow_me_destination"]."@".$_SESSION['domain_name'].",";
-						$dial_string .= "leg_delay_start=".$row["follow_me_delay"].",";
-						$dial_string .= "leg_timeout=".$row["follow_me_timeout"]."]";
-						if (extension_exists($row["follow_me_destination"])) {
-							$dial_string .= "\${sofia_contact(".$row["follow_me_destination"]."@".$_SESSION['domain_name'].")},";
+					//add follow me
+						if (strlen($follow_me_uuid) == 0) {
+							$this->follow_me_add();
 						}
-						else {
-							$bridge = outbound_route_to_bridge ($_SESSION['domain_uuid'], $row["follow_me_destination"]);
-							//if (strlen($bridge[0]) > 0) {
-							//	$dial_string .= "".$bridge[0].",";
-							//}
-							//else {
-								$dial_string .= "loopback/".$row["follow_me_destination"].",";
-							//}
+					//set the extension dial string
+						$sql = "select * from v_follow_me_destinations ";
+						$sql .= "where follow_me_uuid = '".$this->follow_me_uuid."' ";
+						$sql .= "order by follow_me_order asc ";
+						$prep_statement_2 = $db->prepare(check_sql($sql));
+						$prep_statement_2->execute();
+						$result = $prep_statement_2->fetchAll(PDO::FETCH_NAMED);
+						$dial_string = "{instant_ringback=true,ignore_early_media=true,sip_invite_domain=".$_SESSION['domain_name'];
+						if ($this->call_prompt == "true") {
+							$dial_string .= ",group_confirm_key=exec,group_confirm_file=lua confirm.lua";
 						}
-					}
-					$this->dial_string = trim($dial_string, ",");
+						//if (strlen($this->cid_name_prefix) > 0) {
+						//	$dial_string .= ",effective_caller_id_name=".$this->cid_name_prefix."#123";
+						//}
+						$dial_string .= "}";
+						foreach ($result as &$row) {
+							$dial_string .= "[presence_id=".$row["follow_me_destination"]."@".$_SESSION['domain_name'].",";
+							$dial_string .= "leg_delay_start=".$row["follow_me_delay"].",";
+							$dial_string .= "leg_timeout=".$row["follow_me_timeout"]."]";
+							if (extension_exists($row["follow_me_destination"])) {
+								$dial_string .= "\${sofia_contact(".$row["follow_me_destination"]."@".$_SESSION['domain_name'].")},";
+							}
+							else {
+								$bridge = outbound_route_to_bridge ($_SESSION['domain_uuid'], $row["follow_me_destination"]);
+								//if (strlen($bridge[0]) > 0) {
+								//	$dial_string .= "".$bridge[0].",";
+								//}
+								//else {
+									$dial_string .= "loopback/".$row["follow_me_destination"].",";
+								//}
+							}
+						}
+						$this->dial_string = trim($dial_string, ",");
 				}
 				else {
 					$this->dial_string = '';