diff -Nuar asterisk.orig/apps/app_voicemail.c asterisk/apps/app_voicemail.c
--- asterisk.orig/apps/app_voicemail.c	2005-07-19 18:40:31.000000000 -0400
+++ asterisk/apps/app_voicemail.c	2005-07-19 19:18:33.000000000 -0400
@@ -4342,10 +4342,7 @@
 			snprintf(prefile,sizeof(prefile), "%s%s/%s/greet", VM_SPOOL_DIR, vmu->context, vms->username);
 			cmd = play_record_review(chan,"vm-rec-name",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL);
 			break;
-		case '4': 
-			cmd = vm_tempgreeting(chan, vmu, vms, fmtc);
-			break;
-		case '5':
+		case '4':
 			if (vmu->password[0] == '-') {
 				cmd = ast_play_and_wait(chan, "vm-no");
 				break;
@@ -4385,6 +4382,9 @@
 			ast_log(LOG_DEBUG,"User %s set password to %s of length %d\n",vms->username,newpassword,(int)strlen(newpassword));
 			cmd = ast_play_and_wait(chan,"vm-passchanged");
 			break;
+		case '5':
+			cmd = vm_tempgreeting(chan, vmu, vms, fmtc);
+			break;
 		case '*': 
 			cmd = 't';
 			break;