diff --git a/app/dialplans/dialplan_edit.php b/app/dialplans/dialplan_edit.php
index daa4fbeac7..f95ef31b0f 100644
--- a/app/dialplans/dialplan_edit.php
+++ b/app/dialplans/dialplan_edit.php
@@ -382,17 +382,17 @@
 	echo "<form method='post' name='frm' action=''>\n";
 	echo "<input type='hidden' name='app_uuid' value='".escape($app_uuid)."'>\n";
 
-	echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"1\">\n";
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='1'>\n";
 	echo "	<tr>\n";
 	echo "		<td align='left' width='30%'>\n";
-	echo"			<span class=\"title\">".$text['title-dialplan_edit']."</span><br />\n";
+	echo "			<span class='title'>".$text['title-dialplan_edit']."</span><br />\n";
 	echo "		</td>\n";
 	echo "		<td width='70%' align='right'>\n";
+	echo "			<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='dialplans.php".(is_uuid($app_uuid) ? "?app_uuid=".escape($app_uuid) : null)."';\" value='".$text['button-back']."'>\n";
 	if (permission_exists('dialplan_xml')) {
-		echo "			<input type='button' class='btn' name='' alt='".$text['button-xml']."' onclick=\"window.location='dialplan_xml.php?id=".escape($dialplan_uuid)."&".((strlen($app_uuid) > 0) ? "app_uuid=".escape($app_uuid) : null)."';\" value='".$text['button-xml']."'>\n";
+		echo "			<input type='button' class='btn' name='' alt='".$text['button-xml']."' onclick=\"window.location='dialplan_xml.php?id=".escape($dialplan_uuid).(is_uuid($app_uuid) ? "&app_uuid=".escape($app_uuid) : null)."';\" value='".$text['button-xml']."'>\n";
 	}
-	echo "			<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='dialplans.php".((strlen($app_uuid) > 0) ? "?app_uuid=".escape($app_uuid) : null)."';\" value='".$text['button-back']."'>\n";
-	echo "			<input type='button' class='btn' name='' alt='".$text['button-copy']."' onclick=\"if (confirm('".$text['confirm-copy']."')){window.location='dialplan_copy.php?id=".escape($dialplan_uuid)."';}\" value='".$text['button-copy']."'>\n";
+	echo "			<input type='button' class='btn' name='' alt='".$text['button-copy']."' onclick=\"if (confirm('".$text['confirm-copy']."')){ window.location='dialplan_copy.php?id=".escape($dialplan_uuid)."'; }\" value='".$text['button-copy']."'>\n";
 	echo "			<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>\n";
@@ -880,4 +880,4 @@
 //show the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/dialplans/dialplan_xml.php b/app/dialplans/dialplan_xml.php
index f3a3d44ff4..780c7f9aed 100644
--- a/app/dialplans/dialplan_xml.php
+++ b/app/dialplans/dialplan_xml.php
@@ -47,11 +47,6 @@
 		$app_uuid = $_REQUEST['app_uuid'];
 	}
 
-//set the default app_uuid
-	if (!is_uuid($app_uuid)) {
-		$app_uuid = '742714e5-8cdf-32fd-462c-cbe7e3d655db';
-	}
-
 //get the dialplan xml
 	if (is_uuid($dialplan_uuid)) {
 		$sql = "select * from v_dialplans ";
@@ -61,7 +56,6 @@
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$domain_uuid = $row["domain_uuid"];
-			//$app_uuid = $row["app_uuid"];
 			$dialplan_name = $row["dialplan_name"];
 			$dialplan_number = $row["dialplan_number"];
 			$dialplan_order = $row["dialplan_order"];
@@ -86,7 +80,7 @@
 		//save to the data
 			$database = new database;
 			$database->app_name = 'dialplans';
-			$database->app_uuid = $app_uuid;
+			$database->app_uuid = is_uuid($app_uuid) ? $app_uuid : '742714e5-8cdf-32fd-462c-cbe7e3d655db';
 			$database->save($array);
 			unset($array);
 
@@ -98,7 +92,7 @@
 			message::add($text['message-update']);
 
 		//redirect the user
-			header("Location: dialplan_edit.php?id=".$dialplan_uuid."&".((strlen($app_uuid) > 0) ? "app_uuid=".$app_uuid : null));
+			header("Location: dialplan_edit.php?id=".$dialplan_uuid.(is_uuid($app_uuid) ? "&app_uuid=".$app_uuid : null));
 			exit;
 
 	}
@@ -114,13 +108,13 @@
 	echo "<form method='post' name='frm' action=''>\n";
 	echo "	<input type='hidden' name='app_uuid' value='".$app_uuid."'>\n";
 	echo "	<input type='hidden' name='dialplan_uuid' value='".$dialplan_uuid."'>\n";
-	echo "	<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"1\">\n";
+	echo "	<table width='100%' border='0' cellpadding='0' cellspacing='1'>\n";
 	echo "		<tr>\n";
 	echo "			<td align='left' width='30%'>\n";
-	echo "				<span class=\"title\">".$text['title-dialplan_edit']."</span><br />\n";
+	echo "				<span class='title'>".$text['title-dialplan_edit']."</span><br />\n";
 	echo "			</td>\n";
 	echo "			<td width='70%' align='right'>\n";
-	echo "				<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='dialplan_edit.php?id=".$dialplan_uuid."&".((strlen($app_uuid) > 0) ? "app_uuid=".$app_uuid : null)."';\" value='".$text['button-back']."'>\n";
+	echo "				<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='dialplan_edit.php?id=".$dialplan_uuid.(is_uuid($app_uuid) ? "&app_uuid=".$app_uuid : null)."';\" value='".$text['button-back']."'>\n";
 	echo "				<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "			</td>\n";
 	echo "		</tr>\n";
@@ -131,10 +125,10 @@
 	echo "		</tr>\n";
 	echo "	</table>";
 	echo "	<br />\n";
-	echo "	<textarea name=\"dialplan_xml\" class=\"formfld\" style=\"width: 100%; max-width: 100%; height: 450px; padding:20px;\">$dialplan_xml</textarea>\n";
+	echo "	<textarea name='dialplan_xml' class='formfld' style='width: 100%; max-width: 100%; height: 450px; padding: 2px 0;'>".$dialplan_xml."</textarea>\n";
 	echo "</form>\n";
 
 //show the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file