diff --git a/app/fifo/fifo_add.php b/app/fifo/fifo_add.php
index 5670d5afbf..806d08299f 100644
--- a/app/fifo/fifo_add.php
+++ b/app/fifo/fifo_add.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Copyright (C) 2010 - 2020
+	Copyright (C) 2010 - 2023
 	All Rights Reserved.
 
 	Contributor(s):
@@ -451,7 +451,7 @@
 	echo "		".$text['label-name']."\n";
 	echo "	</td>\n";
 	echo "	<td width='70%' class='vtable' align='left'>\n";
-	echo "		<input class='formfld' type='text' name='extension_name' maxlength='255' value=\"$extension_name\" required='required'>\n";
+	echo "		<input class='formfld' type='text' name='extension_name' maxlength='255' value=\"".($extension_name ?? null)."\" required='required'>\n";
 	echo "		<br />\n";
 	echo "		".$text['description-name']."\n";
 	echo "	</td>\n";
@@ -462,9 +462,9 @@
 	echo "	".$text['label-extension']."\n";
 	echo "	</td>\n";
 	echo "	<td class='vtable' align='left'>\n";
-	echo "		<input class='formfld' type='text' name='queue_extension_number' maxlength='255' min='0' step='1' value=\"$queue_extension_number\" required='required'>\n";
+	echo "		<input class='formfld' type='text' name='queue_extension_number' maxlength='255' min='0' step='1' value=\"".($queue_extension_number ?? null)."\" required='required'>\n";
 	echo "		<br />\n";
-	echo "		".$text['description-extension']."\n";
+	echo "		".($text['description-extension'] ?? null)."\n";
 	echo "	</td>\n";
 	echo "	</tr>\n";
 
@@ -474,13 +474,9 @@
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select name='dialplan_order' class='formfld'>\n";
-	$i = 300;
-	while ($i <= 999) {
-		$selected = ($dialplan_order == $i) ? "selected" : null;
-		if (strlen($i) == 1) { echo "<option value='00$i' ".$selected.">00$i</option>\n"; }
-		if (strlen($i) == 2) { echo "<option value='0$i' ".$selected.">0$i</option>\n"; }
-		if (strlen($i) == 3) { echo "<option value='$i' ".$selected.">$i</option>\n"; }
-		$i++;
+	for ($i = 300; $i <= 999; $i++) {
+		$selected = !empty($dialplan_order) && $dialplan_order == $i ? "selected" : null;
+		echo "<option value='".$i."' ".$selected.">".$i."</option>\n";
 	}
 	echo "	</select>\n";
 	echo "	<br />\n";
@@ -493,18 +489,8 @@
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "    <select class='formfld' name='dialplan_enabled'>\n";
-	if ($dialplan_enabled == "true") {
-		echo "    <option value='true' selected='selected' >".$text['option-true']."</option>\n";
-	}
-	else {
-		echo "    <option value='true'>".$text['option-true']."</option>\n";
-	}
-	if ($dialplan_enabled == "false") {
-		echo "    <option value='false' selected='selected' >".$text['option-false']."</option>\n";
-	}
-	else {
-		echo "    <option value='false'>".$text['option-false']."</option>\n";
-	}
+	echo "    	<option value='true'>".$text['option-true']."</option>\n";
+	echo "    	<option value='false' ".(!empty($dialplan_enabled) && $dialplan_enabled == "false" ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
 	echo "    </select>\n";
 	echo "<br />\n";
 	echo "\n";
@@ -516,7 +502,7 @@
 	echo "    ".$text['label-description']."\n";
 	echo "</td>\n";
 	echo "<td colspan='4' class='vtable' align='left'>\n";
-	echo "    <input class='formfld' type='text' name='dialplan_description' maxlength='255' value=\"$dialplan_description\">\n";
+	echo "    <input class='formfld' type='text' name='dialplan_description' maxlength='255' value=\"".($dialplan_description ?? null)."\">\n";
 	echo "<br />\n";
 	echo "\n";
 	echo "</td>\n";
@@ -535,7 +521,7 @@
 	echo "    ".$text['label-agent_queue_extension']."\n";
 	echo "</td>\n";
 	echo "<td width='70%' class='vtable' align='left'>\n";
-	echo "    <input class='formfld' type='text' name='agent_queue_extension_number' maxlength='255' min='0' step='1' value=\"$agent_queue_extension_number\">\n";
+	echo "    <input class='formfld' type='text' name='agent_queue_extension_number' maxlength='255' min='0' step='1' value=\"".($agent_queue_extension_number ?? null)."\">\n";
 	echo "<br />\n";
 	echo $text['description-agent_queue_extension']."\n";
 	echo "</td>\n";
@@ -546,7 +532,7 @@
 	echo "    ".$text['label-agent_loginout_extension']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "    <input class='formfld' type='text' name='agent_login_logout_extension_number' maxlength='255' min='0' step='1' value=\"$agent_login_logout_extension_number\">\n";
+	echo "    <input class='formfld' type='text' name='agent_login_logout_extension_number' maxlength='255' min='0' step='1' value=\"".($agent_login_logout_extension_number ?? null)."\">\n";
 	echo "<br />\n";
 	echo $text['description-agent_loginout_extension']."\n";
 	echo "</td>\n";
@@ -555,8 +541,8 @@
 	echo "</table>\n";
 	echo "<br><br>\n";
 
-	if ($action == "update") {
-		echo "<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
+	if (!empty($action) && $action == "update") {
+		echo "<input type='hidden' name='dialplan_uuid' value='".($dialplan_uuid ?? null)."'>\n";
 	}
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 
@@ -565,4 +551,4 @@
 //show the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file