diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php
index a08373828c..c5a8dfb0f7 100644
--- a/app/calls/call_edit.php
+++ b/app/calls/call_edit.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
+	Portions created by the Initial Developer are Copyright (C) 2008-2014
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -585,7 +585,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "			</td>\n";
 	if (permission_exists('follow_me_prompt')) {
 		echo "		<td>\n";
-		echo "			<select class='formfld' style='width: 90px;' name='destinations_prompt_1]'>\n";
+		echo "			<select class='formfld' style='width: 90px;' name='destination_prompt_1]'>\n";
 		echo "				<option value=''></option>\n";
 		echo "				<option value='1' ".(($row['destination_prompt_1'])?"selected='selected'":null).">".$text['label-destination_prompt_confirm']."</option>\n";
 		//echo "			<option value='2'>".$text['label-destination_prompt_announce]."</option>\n";
@@ -605,7 +605,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "			</td>\n";
 	if (permission_exists('follow_me_prompt')) {
 		echo "		<td>\n";
-		echo "			<select class='formfld' style='width: 90px;' name='destinations_prompt_2]'>\n";
+		echo "			<select class='formfld' style='width: 90px;' name='destination_prompt_2]'>\n";
 		echo "				<option value=''></option>\n";
 		echo "				<option value='1' ".(($row['destination_prompt_2'])?"selected='selected'":null).">".$text['label-destination_prompt_confirm']."</option>\n";
 		//echo "			<option value='2'>".$text['label-destination_prompt_announce]."</option>\n";
@@ -625,7 +625,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "			</td>\n";
 	if (permission_exists('follow_me_prompt')) {
 		echo "		<td>\n";
-		echo "			<select class='formfld' style='width: 90px;' name='destinations_prompt_3]'>\n";
+		echo "			<select class='formfld' style='width: 90px;' name='destination_prompt_3]'>\n";
 		echo "				<option value=''></option>\n";
 		echo "				<option value='1' ".(($row['destination_prompt_3'])?"selected='selected'":null).">".$text['label-destination_prompt_confirm']."</option>\n";
 		//echo "			<option value='2'>".$text['label-destination_prompt_announce]."</option>\n";
@@ -645,7 +645,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "			</td>\n";
 	if (permission_exists('follow_me_prompt')) {
 		echo "		<td>\n";
-		echo "			<select class='formfld' style='width: 90px;' name='destinations_prompt_4]'>\n";
+		echo "			<select class='formfld' style='width: 90px;' name='destination_prompt_4]'>\n";
 		echo "				<option value=''></option>\n";
 		echo "				<option value='1' ".(($row['destination_prompt_4'])?"selected='selected'":null).">".$text['label-destination_prompt_confirm']."</option>\n";
 		//echo "			<option value='2'>".$text['label-destination_prompt_announce]."</option>\n";
@@ -665,7 +665,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "			</td>\n";
 	if (permission_exists('follow_me_prompt')) {
 		echo "		<td>\n";
-		echo "			<select class='formfld' style='width: 90px;' name='destinations_prompt_5]'>\n";
+		echo "			<select class='formfld' style='width: 90px;' name='destination_prompt_5]'>\n";
 		echo "				<option value=''></option>\n";
 		echo "				<option value='1' ".(($row['destination_prompt_5'])?"selected='selected'":null).">".$text['label-destination_prompt_confirm']."</option>\n";
 		//echo "			<option value='2'>".$text['label-destination_prompt_announce]."</option>\n";
diff --git a/app/calls/resources/classes/follow_me.php b/app/calls/resources/classes/follow_me.php
index 07c517ebba..da39734d92 100644
--- a/app/calls/resources/classes/follow_me.php
+++ b/app/calls/resources/classes/follow_me.php
@@ -110,7 +110,7 @@ include "root.php";
 				$sql = "update v_follow_me set ";
 				$sql .= "follow_me_enabled = '$this->follow_me_enabled', ";
 				$sql .= "cid_name_prefix = '$this->cid_name_prefix', ";
-				$sql .= "cid_number_prefix = '$this->cid_number_prefix', ";
+				$sql .= "cid_number_prefix = '$this->cid_number_prefix' ";
 				$sql .= "where domain_uuid = '$this->domain_uuid' ";
 				$sql .= "and follow_me_uuid = '$this->follow_me_uuid' ";
 				$db->exec(check_sql($sql));
@@ -147,10 +147,10 @@ include "root.php";
 					$sql .= "'$this->destination_data_1', ";
 					$sql .= "'$this->destination_timeout_1', ";
 					$sql .= "'$this->destination_delay_1', ";
-					$sql .= "'$this->destination_delay_1', ";
 					$sql .= "'$this->destination_prompt_1', ";
 					$sql .= "'1' ";
 					$sql .= ")";
+					//echo $sql.";<br/>";
 					$db->exec(check_sql($sql));
 					$this->destination_order++;
 					unset($sql);
@@ -178,6 +178,7 @@ include "root.php";
 					$sql .= "'$this->destination_prompt_2', ";
 					$sql .= "'2' ";
 					$sql .= ")";
+					//echo $sql.";<br/>";
 					$db->exec(check_sql($sql));
 					$this->destination_order++;
 					unset($sql);