diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 4b8fc814aa1104f06d2ede5cde00972d89991076..5825f92d1c306eb84bffd887605e866601e4e580 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -340,7 +340,7 @@ static char *descrip_vmain =
 "    g(#) - Use the specified amount of gain when recording a voicemail\n"
 "           message. The units are whole-number decibels (dB).\n"
 "    s    - Skip checking the passcode for the mailbox.\n"
-"    a(#) - Skip folder prompt and go directly to folder specified, default 1\n";
+"    a(#) - Skip folder prompt and go directly to folder specified, defaults to 1\n";
 
 static char *synopsis_vm_box_exists =
 "Check to see if Voicemail mailbox exists";
@@ -5080,7 +5080,7 @@ static int vm_execmain(struct ast_channel *chan, void *data)
 					LOCAL_USER_REMOVE(u);
 					return -1;
 				}
-				else if ( play_folder > 9 || play_folder < 1) {
+				else if ( play_folder > 9 || play_folder < 0) {
 					ast_log(LOG_WARNING, "Invalid value '%d' provided for folder autoplay option\n", play_folder);
 					LOCAL_USER_REMOVE(u);
 					return -1;