diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php
index 24b4626ec4..88835cc73b 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_edit.php
@@ -249,6 +249,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
+//initialize the destinations object
+	$destination = new destinations;
+
 //pre-populate the form
 	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
 		$voicemail_uuid = check_str($_GET["id"]);
@@ -395,9 +398,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "  <input class='formfld' style='width:70px' type='text' name='voicemail_options[".$c."][voicemail_option_digits]' maxlength='255' value='".$voicemail_option_digits."'>\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left' nowrap='nowrap'>\n";
-		$tmp_select_value = '';
-		switch_select_destination("ivr", $voicemail_options_label, 'voicemail_options['.$c.'][voicemail_option_param]', $tmp_select_value, "width:175px", $voicemail_option_action);
-		unset($tmp_select_value);
+		//switch_select_destination("ivr", $voicemail_options_label, 'voicemail_options['.$c.'][voicemail_option_param]', $tmp_select_value, "width:175px", $voicemail_option_action);
+		echo $destination->select('ivr', 'voicemail_options['.$c.'][voicemail_option_param]', '');
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
 		echo "	<select name='voicemail_options[".$c."][voicemail_option_order]' class='formfld' style='width:55px'>\n";
diff --git a/app/voicemails/voicemail_option_edit.php b/app/voicemails/voicemail_option_edit.php
index 66461386a5..83b9723948 100644
--- a/app/voicemails/voicemail_option_edit.php
+++ b/app/voicemails/voicemail_option_edit.php
@@ -112,6 +112,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
+//initialize the destinations object
+	$destination = new destinations;
+
 //pre-populate the form
 	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
 		$voicemail_option_uuid = $_GET["id"];
@@ -184,7 +187,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if (strlen($voicemail_option_action.$voicemail_option_param) > 0) {
 		$tmp_select_value = $voicemail_option_action.':'.$voicemail_option_param;
 	}
-	switch_select_destination("ivr", $voicemail_options_label, "voicemail_option_param", $tmp_select_value, "width: 350px;", $voicemail_option_action);
+	//switch_select_destination("ivr", $voicemail_options_label, "voicemail_option_param", $tmp_select_value, "width: 350px;", $voicemail_option_action);
+	echo $destination->select('ivr', 'voicemail_option_param', $tmp_select_value);
 	unset($tmp_select_value);
 
 	echo "<br />\n";