diff --git a/app/voicemail_greetings/voicemail_greeting_edit.php b/app/voicemail_greetings/voicemail_greeting_edit.php
index 37377353b7..1791c1fc94 100644
--- a/app/voicemail_greetings/voicemail_greeting_edit.php
+++ b/app/voicemail_greetings/voicemail_greeting_edit.php
@@ -46,7 +46,7 @@
 	if (is_uuid($_REQUEST["id"])) {
 		$voicemail_greeting_uuid = $_REQUEST["id"];
 	}
-	if (is_uuid($_REQUEST["voicemail_id"])) {
+	if (is_numeric($_REQUEST["voicemail_id"])) {
 		$voicemail_id = $_REQUEST["voicemail_id"];
 	}
 
diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php
index 30cab8d896..b9026bd2ee 100644
--- a/app/voicemail_greetings/voicemail_greetings.php
+++ b/app/voicemail_greetings/voicemail_greetings.php
@@ -288,7 +288,7 @@
 			while (($file = readdir($dh)) !== false) {
 				if (filetype($v_greeting_dir."/".$file) == "file" && substr($file, 0, 8) == "greeting" && substr($file, 10, 4) != ".tmp") {
 					$greeting_number = preg_replace('{\D}', '', $file);
-					if (!in_array($file, $array_greetings)) {
+					if (is_array($array_greetings) && !in_array($file, $array_greetings)) {
 						//file not found, add to database
 							$greeting_name = $text['label-greeting'].' '.$greeting_number;
 							$greeting_description = base64_decode($_GET['gd']);