Index: sounds.txt
===================================================================
RCS file: /usr/cvsroot/asterisk/sounds.txt,v
retrieving revision 1.30
diff -u -p -r1.30 sounds.txt
--- sounds.txt	28 Jun 2004 20:17:20 -0000	1.30
+++ sounds.txt	16 Jul 2004 20:02:27 -0000
@@ -128,7 +128,9 @@
 
 %vm-INBOX.gsm%new
 
-%vm-incorrect.gsm%Login incorrect.  Mailbox?
+%vm-incorrect-mailbox.gsm%Login incorrect.  Mailbox?
+
+%vm-incorrect.gsm%Login incorrect.
 
 %vm-instructions.gsm%To look into your messages press 1 now.  You may quit voicemail at any time by pressing the pound key.
 
Index: apps/app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.133
diff -u -p -r1.133 app_voicemail.c
--- apps/app_voicemail.c	14 Jul 2004 07:34:34 -0000	1.133
+++ apps/app_voicemail.c	16 Jul 2004 20:02:29 -0000
@@ -3567,13 +3567,19 @@ static int vm_execmain(struct ast_channe
 			if (prefix)
 				strncpy(vms.username, empty, sizeof(vms.username) -1);
 		}
+		logretries++;
 		if (!valid) {
-			if (useadsi)
-				adsi_login(chan);
-			if (ast_streamfile(chan, "vm-incorrect", chan->language))
-				break;
+			if (skipuser || logretries >= maxlogins) {
+				if (ast_streamfile(chan, "vm-incorrect", chan->language))
+					break;
+			} else {
+				if (useadsi)
+					adsi_login(chan);
+				if (ast_streamfile(chan, "vm-incorrect-mailbox", chan->language))
+					break;
+			}
+			ast_waitstream(chan, "");
 		}
-		logretries++;
 	}
 	if (!valid && (logretries >= maxlogins)) {
 		ast_stopstream(chan);