diff --git a/app/dialplan/dialplan_details_delete.php b/app/dialplan/dialplan_details_delete.php
index afe28f0808..46d6082eca 100644
--- a/app/dialplan/dialplan_details_delete.php
+++ b/app/dialplan/dialplan_details_delete.php
@@ -46,6 +46,7 @@ else {
 
 if (count($_GET)>0) {
 	$id = $_GET["id"];
+	$app_uuid = check_str($_REQUEST["app_uuid"]);
 	$dialplan_uuid = check_str($_REQUEST["id2"]);
 }
 
@@ -72,7 +73,7 @@ if (strlen($id)>0) {
 
 //redirect the user
 	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=dialplan_edit.php?id=".$dialplan_uuid."\">\n";
+	echo "<meta http-equiv=\"refresh\" content=\"2;url=dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_uuid."\">\n";
 	echo "<div align='center'>\n";
 	echo $text['message-delete']."\n";
 	echo "</div>\n";
diff --git a/app/dialplan/dialplan_details_edit.php b/app/dialplan/dialplan_details_edit.php
index 3cb06f3b35..2a28e399ff 100644
--- a/app/dialplan/dialplan_details_edit.php
+++ b/app/dialplan/dialplan_details_edit.php
@@ -63,6 +63,7 @@ else {
 	}
 
 //get the http values and set them as php variables
+	$app_uuid = check_str($_REQUEST["app_uuid"]);
 	if (count($_POST)>0) {
 		if (isset($_REQUEST["dialplan_uuid"])) {
 			$dialplan_uuid = check_str($_POST["dialplan_uuid"]);
@@ -150,7 +151,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				}
 
 				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=dialplan_edit.php?id=".$dialplan_uuid."\">\n";
+				echo "<meta http-equiv=\"refresh\" content=\"2;url=dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_uuid."\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-add']."\n";
 				echo "</div>\n";
@@ -189,7 +190,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				}
 
 				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=dialplan_edit.php?id=".$dialplan_uuid."\">\n";
+				echo "<meta http-equiv=\"refresh\" content=\"2;url=dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_uuid."\">\n";
 				echo "<div align='center'>\n";
 				echo $text['message-update']."\n";
 				echo "</div>\n";
@@ -237,7 +238,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<td align='left' width='30%' nowrap=\"nowrap\"><span class=\"title\">".$text['header-dialplan_detail']."</span></td>\n";
-	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='dialplan_edit.php?id=".$dialplan_uuid."'\" value='".$text['button-back']."'></td>\n";
+	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_uuid."';\" value='".$text['button-back']."'></td>\n";
 	echo "</tr>\n";
 
 	?>
@@ -565,6 +566,7 @@ function Replaceivr_menu_option_param(obj){
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
 	echo "				<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
+	echo "				<input type='hidden' name='app_uuid' value='$app_uuid'>\n";
 	if ($action == "update") {
 		echo "				<input type='hidden' name='dialplan_detail_uuid' value='$dialplan_detail_uuid'>\n";
 	}
diff --git a/app/dialplan/dialplan_edit.php b/app/dialplan/dialplan_edit.php
index b3a708c9d6..171e45791d 100644
--- a/app/dialplan/dialplan_edit.php
+++ b/app/dialplan/dialplan_edit.php
@@ -504,7 +504,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "<th align='center' width='70%'>".$text['label-data']."</th>\n";
 			echo "<th align='center'>".$text['label-order']."</th>\n";
 			echo "<td align='right' width='42'>\n";
-			echo "	<a href='dialplan_details_edit.php?id2=".$dialplan_uuid."' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
+			echo "	<a href='dialplan_details_edit.php?id2=".$dialplan_uuid."&app_uuid=".$app_uuid."' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
 			echo "</td>\n";
 			echo "<tr>\n";
 
@@ -519,7 +519,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 						echo "		<td width='33.3%' nowrap='nowrap'>&nbsp;</td>\n";
 						echo "		<td width='33.3%' align='center' nowrap='nowrap'>$paging_controls</td>\n";
 						echo "		<td width='33.3%' align='right'>\n";
-						echo "			<a href='dialplan_details_edit.php?id2=".$dialplan_uuid."' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
+						echo "			<a href='dialplan_details_edit.php?id2=".$dialplan_uuid."&app_uuid=".$app_uuid."' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
 						echo "		</td>\n";
 						echo "	</tr>\n";
 						echo "	</table>\n";
@@ -537,7 +537,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 						echo "<th align='center' width='70%'>".$text['label-data']."</th>\n";
 						echo "<th align='center'>".$text['label-order']."</th>\n";
 						echo "<td align='right' width='42'>\n";
-						echo "	<a href='dialplan_details_edit.php?id2=".$dialplan_uuid."' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
+						echo "	<a href='dialplan_details_edit.php?id2=".$dialplan_uuid."&app_uuid=".$app_uuid."' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
 						echo "</td>\n";
 						echo "<tr>\n";
 					}
@@ -549,8 +549,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 						echo "	<td valign='top' class='".$row_style[$c]."'>&nbsp;&nbsp;".wordwrap($row['dialplan_detail_data'],180,"<br>",1)."</td>\n";
 						echo "	<td valign='top' class='".$row_style[$c]."'>&nbsp;&nbsp;".$row['dialplan_detail_order']."</td>\n";
 						echo "	<td valign='top' align='right' nowrap='nowrap'>\n";
-						echo "		<a href='dialplan_details_edit.php?id=".$row['dialplan_detail_uuid']."&id2=".$dialplan_uuid."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
-						echo "		<a href='dialplan_details_delete.php?id=".$row['dialplan_detail_uuid']."&id2=".$dialplan_uuid."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
+						echo "		<a href='dialplan_details_edit.php?id=".$row['dialplan_detail_uuid']."&id2=".$dialplan_uuid."&app_uuid=".$app_uuid."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
+						echo "		<a href='dialplan_details_delete.php?id=".$row['dialplan_detail_uuid']."&id2=".$dialplan_uuid."&app_uuid=".$app_uuid."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
 						echo "	</td>\n";
 						echo "</tr>\n";
 					}
@@ -567,7 +567,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "		<td width='33.3%' nowrap='nowrap'>&nbsp;</td>\n";
 			echo "		<td width='33.3%' align='center' nowrap='nowrap'>$paging_controls</td>\n";
 			echo "		<td width='33.3%' align='right'>\n";
-			echo "			<a href='dialplan_details_edit.php?id2=".$dialplan_uuid."' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
+			echo "			<a href='dialplan_details_edit.php?id2=".$dialplan_uuid."&app_uuid=".$app_uuid."' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
 			echo "		</td>\n";
 			echo "	</tr>\n";
 			echo "	</table>\n";