diff --git a/app/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php
index 2b816ae2c1..ea0cabd15b 100644
--- a/app/ivr_menu/ivr_menu_edit.php
+++ b/app/ivr_menu/ivr_menu_edit.php
@@ -462,7 +462,19 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	else {
 		echo "		<select name='ivr_menu_greet_long' class='formfld'>\n";
 	}
-	echo "		<option></option>\n";
+	//select
+		if (if_group("superadmin")) {
+			if (!$tmp_selected) {
+				echo "<optgroup label='selected'>\n";
+				if (file_exists($_SESSION['switch']['recordings']['dir']."/".$ivr_menu_greet_long)) {
+					echo "		<option value='".$_SESSION['switch']['recordings']['dir']."/".$ivr_menu_greet_long."' selected='selected'>".$ivr_menu_greet_long."</option>\n";
+				} elseif (substr($ivr_menu_greet_long, -3) == "wav" || substr($ivr_menu_greet_long, -3) == "mp3") {
+					echo "		<option value='".$ivr_menu_greet_long."' selected='selected'>".$ivr_menu_greet_long."</option>\n";
+				}
+				echo "</optgroup>\n";
+			}
+			unset($tmp_selected);
+		}
 	//misc optgroup
 		if (if_group("superadmin")) {
 			echo "<optgroup label='misc'>\n";
@@ -513,24 +525,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			}
 		}
 		echo "</optgroup>\n";
-	//select
-		if (if_group("superadmin")) {
-			if (!$tmp_selected) {
-				echo "<optgroup label='selected'>\n";
-				if (file_exists($_SESSION['switch']['recordings']['dir']."/".$ivr_menu_greet_long)) {
-					echo "		<option value='".$_SESSION['switch']['recordings']['dir']."/".$ivr_menu_greet_long."' selected='selected'>".$ivr_menu_greet_long."</option>\n";
-				} elseif (substr($ivr_menu_greet_long, -3) == "wav" || substr($ivr_menu_greet_long, -3) == "mp3") {
-					echo "		<option value='".$ivr_menu_greet_long."' selected='selected'>".$ivr_menu_greet_long."</option>\n";
-				} else {
-					echo "		<option value='".$ivr_menu_greet_long."' selected='selected'>".$ivr_menu_greet_long."</option>\n";
-				}
-
-				echo "</optgroup>\n";
-			}
-			unset($tmp_selected);
-		}
-	echo "		</select>\n";
-	echo "<br />\n";
+	echo "	</select>\n";
+	echo "	<br />\n";
 	echo $text['description-greet_long']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
@@ -747,7 +743,6 @@ for ($c = 0; $c < 1; $c++) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='ivr_menu_direct_dial'>\n";
-	echo "	<option value=''></option>\n";
 	if ($ivr_menu_direct_dial == "true") {
 		echo "	<option value='true' selected='selected'>".$text['option-true']."</option>\n";
 	}
@@ -983,7 +978,6 @@ for ($c = 0; $c < 1; $c++) {
 	echo "</td>\n";
 	echo "<td width=\"70%\" class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='ivr_menu_enabled'>\n";
-	echo "	<option value=''></option>\n";
 	if ($ivr_menu_enabled == "true") {
 		echo "	<option value='true' selected='selected'>".$text['option-true']."</option>\n";
 	}
diff --git a/app/ivr_menu/ivr_menu_option_edit.php b/app/ivr_menu/ivr_menu_option_edit.php
index 85bdd973f0..f0b47b5d97 100644
--- a/app/ivr_menu/ivr_menu_option_edit.php
+++ b/app/ivr_menu/ivr_menu_option_edit.php
@@ -306,20 +306,17 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select name='ivr_menu_option_order' class='formfld'>\n";
-	//echo "	<option></option>\n";
-	if (strlen(htmlspecialchars($ivr_menu_option_order))> 0) {
-		echo "	<option selected='yes' value='".htmlspecialchars($ivr_menu_option_order)."'>".htmlspecialchars($ivr_menu_option_order)."</option>\n";
-	}
 	$i=0;
 	while($i<=999) {
+		$selected = ($ivr_menu_option_order == $i) ? "selected" : null;
 		if (strlen($i) == 1) {
-			echo "	<option value='00$i'>00$i</option>\n";
+			echo "	<option value='00$i' ".$selected.">00$i</option>\n";
 		}
 		if (strlen($i) == 2) {
-			echo "	<option value='0$i'>0$i</option>\n";
+			echo "	<option value='0$i' ".$selected.">0$i</option>\n";
 		}
 		if (strlen($i) == 3) {
-			echo "	<option value='$i'>$i</option>\n";
+			echo "	<option value='$i' ".$selected.">$i</option>\n";
 		}
 		$i++;
 	}