diff --git a/includes/lib_switch.php b/includes/lib_switch.php
index d39ecd0837..e114632e4e 100644
--- a/includes/lib_switch.php
+++ b/includes/lib_switch.php
@@ -1354,21 +1354,21 @@ function switch_select_destination($select_type, $select_label, $select_name, $s
 			$extension = $row["extension"];
 			$context = $row["user_context"];
 			$description = $row["description"];
-			if ("voicemail default \${domain_name} ".$extension == $select_value || "voicemail:default \${domain_name} ".$extension == $select_value) {
+			if ("voicemail default \${domain_name} ".$extension == $select_value || "transfer:*99".$extension." XML ".$_SESSION["context"] == $select_value || "voicemail:default \${domain_name} ".$extension == $select_value) {
 				if ($select_type == "ivr") {
-					echo "		<option value='menu-exec-app:voicemail default \${domain_name} $extension' selected='selected'>".$extension." ".$description."</option>\n";
+					echo "		<option value='menu-exec-app:transfer *99".$extension." XML ".$_SESSION["context"]."' selected='selected'>".$extension." ".$description."</option>\n";
 				}
 				if ($select_type == "dialplan") {
-					echo "		<option value='voicemail:default \${domain_name} $extension' selected='selected'>".$extension." ".$description."</option>\n";
+					echo "		<option value='transfer:*99".$extension." XML ".$_SESSION["context"]."' selected='selected'>".$extension." ".$description."</option>\n";
 				}
 				$selection_found = true;
 			}
 			else {
 				if ($select_type == "ivr") {
-					echo "		<option value='menu-exec-app:voicemail default \${domain_name} $extension'>".$extension." ".$description."</option>\n";
+					echo "		<option value='menu-exec-app:transfer *99".$extension." XML ".$_SESSION["context"]."'>".$extension." ".$description."</option>\n";
 				}
 				if ($select_type == "dialplan") {
-					echo "		<option value='voicemail:default \${domain_name} $extension'>".$extension." ".$description."</option>\n";
+					echo "		<option value='transfer:*99".$extension." XML ".$_SESSION["context"]."'>".$extension." ".$description."</option>\n";
 				}
 			}
 		}