diff --git a/app/calls/app_languages.php b/app/calls/app_languages.php
index 63ff713d58..9ff91fbe05 100644
--- a/app/calls/app_languages.php
+++ b/app/calls/app_languages.php
@@ -55,30 +55,40 @@
 	$text['label-follow-me']['pt-pt'] = "Segue-me";
 	$text['label-follow-me']['fr-fr'] = "Follow Me";
 
-	$text['label-ring-1']['en-us'] = "Ring 1st Number";
-	$text['label-ring-1']['es-cl'] = "1º Número a Sonar";
-	$text['label-ring-1']['pt-pt'] = "1º Número a Tocar";
-	$text['label-ring-1']['fr-fr'] = "Sonner le 1er Numéro";
+	$text['label-destinations']['en-us'] = "Destinations";
+	$text['label-destinations']['es-cl'] = "Destinos";
+	$text['label-destinations']['fr-fr'] = "Destinations";
+	$text['label-destinations']['pt-pt'] = "Destinos";
 
-	$text['label-ring-2']['en-us'] = "Ring 2nd Number";
-	$text['label-ring-2']['es-cl'] = "2º Número a Sonar";
-	$text['label-ring-2']['pt-pt'] = "2º Número a Tocar";
-	$text['label-ring-2']['fr-fr'] = "Sonner le 2nd Numéro";
+	$text['label-destination_number']['en-us'] = "Destination";
+	$text['label-destination_number']['es-cl'] = "Destino";
+	$text['label-destination_number']['fr-fr'] = "Destination";
+	$text['label-destination_number']['pt-pt'] = "Destino";
 
-	$text['label-ring-3']['en-us'] = "Ring 3rd Number";
-	$text['label-ring-3']['es-cl'] = "3º Número a Sonar";
-	$text['label-ring-3']['pt-pt'] = "3º Número a Tocar";
-	$text['label-ring-3']['fr-fr'] = "Sonner le 3ème Numéro";
+	$text['label-destination_delay']['en-us'] = "Delay";
+	$text['label-destination_delay']['es-cl'] = "Retraso";
+	$text['label-destination_delay']['fr-fr'] = "Délais";
+	$text['label-destination_delay']['pt-pt'] = "Atraso";
 
-	$text['label-ring-4']['en-us'] = "Ring 4th Number";
-	$text['label-ring-4']['es-cl'] = "4º Número a Sonar";
-	$text['label-ring-4']['pt-pt'] = "4º Número a Tocar";
-	$text['label-ring-4']['fr-fr'] = "Sonner le 4ème Numéro";
+	$text['label-destination_timeout']['en-us'] = "Timeout";
+	$text['label-destination_timeout']['es-cl'] = "Timeout";
+	$text['label-destination_timeout']['fr-fr'] = "Timeout";
+	$text['label-destination_timeout']['pt-pt'] = "Timeout";
 
-	$text['label-ring-5']['en-us'] = "Ring 5th Number";
-	$text['label-ring-5']['es-cl'] = "5º Número a Sonar";
-	$text['label-ring-5']['pt-pt'] = "5º Número a Tocar";
-	$text['label-ring-5']['fr-fr'] = "Sonner le 5ème Numéro";
+	$text['label-destination_prompt']['en-us'] = "Prompt";
+	$text['label-destination_prompt']['es-cl'] = "Prompt";
+	$text['label-destination_prompt']['fr-fr'] = "Prompt";
+	$text['label-destination_prompt']['pt-pt'] = "Prompt";
+
+	$text['label-destination_prompt_confirm']['en-us'] = "Confirm";
+	$text['label-destination_prompt_confirm']['es-cl'] = "Confirmar";
+	$text['label-destination_prompt_confirm']['fr-fr'] = "Confirmer";
+	$text['label-destination_prompt_confirm']['pt-pt'] = "Confirmar";
+
+	$text['label-destination_prompt_announce']['en-us'] = "Announce";
+	$text['label-destination_prompt_announce']['es-cl'] = "Anunciar";
+	$text['label-destination_prompt_announce']['fr-fr'] = "Annonce";
+	$text['label-destination_prompt_announce']['pt-pt'] = "Anunciar";
 
 	$text['label-cid-name-prefix']['en-us'] = "Caller ID Name";
 	$text['label-cid-name-prefix']['es-cl'] = "Nombre de Caller ID";
diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php
index e8ea71c190..d3764d9f64 100644
--- a/app/calls/call_edit.php
+++ b/app/calls/call_edit.php
@@ -549,78 +549,121 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-ring-1'].":\n";
+	echo "	".$text['label-destinations'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 
-	echo "	<input class='formfld' type='text' name='destination_data_1' id='destination_data_1' maxlength='255' value=\"$destination_data_1\">\n";
+	echo "	<table border='0' cellpadding='2' cellspacing='0'>\n";
+	echo "		<tr>\n";
+	echo "			<td class='vtable'>".$text['label-destination_number']."</td>\n";
+	echo "			<td class='vtable'>".$text['label-destination_delay']."</td>\n";
+	echo "			<td class='vtable'>".$text['label-destination_timeout']."</td>\n";
+	if (permission_exists('follow_me_prompt')) {
+		echo "		<td class='vtable'>".$text['label-destination_prompt']."</td>\n";
+	}
+	echo "		</tr>\n";
 
-	echo "	".$text['label-ring-delay']."\n";
-	destination_select('destination_delay_1', $destination_delay_1, '0');
-	echo "	".$text['label-ring-timeout']."\n";
-	destination_select('destination_timeout_1', $destination_timeout_1, '30');
-	//echo "<br />\n";
-	//echo "This number rings first.\n";
-	echo "</td>\n";
-	echo "</tr>\n";
+	// 1st destination
+	echo "		<tr>\n";
+	echo "			<td><input class='formfld' type='text' name='destination_data_1' id='destination_data_1' maxlength='255' value=\"".$destination_data_1."\"></td>\n";
+	echo "			<td>\n";
+							destination_select('destination_delay_1', $destination_delay_1, '0');
+	echo "			</td>\n";
+	echo "			<td>\n";
+							destination_select('destination_timeout_1', $destination_timeout_1, '30');
+	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 "				<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";
+		echo "			</select>\n";
+		echo "		</td>\n";
+	}
+	echo "		</tr>\n";
 
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-ring-2'].":\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='destination_data_2' id='destination_data_2' maxlength='255' value=\"$destination_data_2\">\n";
-	echo "	".$text['label-ring-delay']."\n";
-	destination_select('destination_delay_2', $destination_delay_2, '0');
-	echo "	".$text['label-ring-timeout']."\n";
-	destination_select('destination_timeout_2', $destination_timeout_2, '30');
-	//echo "<br />\n";
-	//echo "Enter the destination number.\n";
-	echo "</td>\n";
-	echo "</tr>\n";
+	// 2nd destination
+	echo "		<tr>\n";
+	echo "			<td><input class='formfld' type='text' name='destination_data_2' id='destination_data_2' maxlength='255' value=\"".$destination_data_2."\"></td>\n";
+	echo "			<td>\n";
+						destination_select('destination_delay_2', $destination_delay_2, '0');
+	echo "			</td>\n";
+	echo "			<td>\n";
+						destination_select('destination_timeout_2', $destination_timeout_2, '30');
+	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 "				<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";
+		echo "			</select>\n";
+		echo "		</td>\n";
+	}
+	echo "		</tr>\n";
 
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-ring-3'].":\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='destination_data_3' id='destination_data_3' maxlength='255' value=\"$destination_data_3\">\n";
-	echo "	".$text['label-ring-delay']."\n";
-	destination_select('destination_delay_3', $destination_delay_3, '0');
-	echo "	".$text['label-ring-timeout']."\n";
-	destination_select('destination_timeout_3', $destination_timeout_3, '30');
-	//echo "<br />\n";
-	//echo "Enter the destination number.\n";
-	echo "</td>\n";
-	echo "</tr>\n";
+	// 3rd destination
+	echo "		<tr>\n";
+	echo "			<td><input class='formfld' type='text' name='destination_data_3' id='destination_data_3' maxlength='255' value=\"".$destination_data_3."\"></td>\n";
+	echo "			<td>\n";
+						destination_select('destination_delay_3', $destination_delay_3, '0');
+	echo "			</td>\n";
+	echo "			<td>\n";
+						destination_select('destination_timeout_3', $destination_timeout_3, '30');
+	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 "				<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";
+		echo "			</select>\n";
+		echo "		</td>\n";
+	}
+	echo "		</tr>\n";
 
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-ring-4'].":\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='destination_data_4' id='destination_data_4' maxlength='255' value=\"$destination_data_4\">\n";
-	echo "	".$text['label-ring-delay']."\n";
-	destination_select('destination_delay_4', $destination_delay_4, '0');
-	echo "	".$text['label-ring-timeout']."\n";
-	destination_select('destination_timeout_4', $destination_timeout_4, '30');
-	//echo "<br />\n";
-	//echo "Enter the destination number.\n";
-	echo "</td>\n";
-	echo "</tr>\n";
+	// 4th destination
+	echo "		<tr>\n";
+	echo "			<td><input class='formfld' type='text' name='destination_data_4' id='destination_data_4' maxlength='255' value=\"".$destination_data_4."\"></td>\n";
+	echo "			<td>\n";
+						destination_select('destination_delay_4', $destination_delay_4, '0');
+	echo "			</td>\n";
+	echo "			<td>\n";
+						destination_select('destination_timeout_4', $destination_timeout_4, '30');
+	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 "				<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";
+		echo "			</select>\n";
+		echo "		</td>\n";
+	}
+	echo "		</tr>\n";
 
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-ring-5'].":\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='destination_data_5' id='destination_data_5' maxlength='255' value=\"$destination_data_5\">\n";
-	echo "	".$text['label-ring-delay']."\n";
-	destination_select('destination_delay_5', $destination_delay_5, '0');
-	echo "	".$text['label-ring-timeout']."\n";
-	destination_select('destination_timeout_5', $destination_timeout_5, '30');
-	//echo "<br />\n";
-	//echo "Enter the destination number.\n";
+	// 5th destination
+	echo "		<tr>\n";
+	echo "			<td><input class='formfld' type='text' name='destination_data_5' id='destination_data_5' maxlength='255' value=\"".$destination_data_5."\"></td>\n";
+	echo "			<td>\n";
+						destination_select('destination_delay_5', $destination_delay_5, '0');
+	echo "			</td>\n";
+	echo "			<td>\n";
+						destination_select('destination_timeout_5', $destination_timeout_5, '30');
+	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 "				<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";
+		echo "			</select>\n";
+		echo "		</td>\n";
+	}
+	echo "		</tr>\n";
+
+	echo "	</table>\n";
 	echo "</td>\n";
 	echo "</tr>\n";