diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 8e27d905e445dbbd4dba833a1b779ff1b6a726db..202b6480d3ff7530b8a76182b8b328adb3ea77fd 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -8472,15 +8472,16 @@ void mm_login(NETMBX * mb, char *user, char *pwd, long trial)
 
 	if(option_debug > 3)
 		ast_log(LOG_DEBUG, "Entering callback mm_login\n");
-	ast_copy_string(user, mb->user,sizeof(user));
+
+	ast_copy_string(user, mb->user, MAILTMPLEN);
 
 	/* We should only do this when necessary */
 	if (!ast_strlen_zero(authpassword)) {
-		ast_copy_string(pwd, authpassword, sizeof(pwd));
+		ast_copy_string(pwd, authpassword, MAILTMPLEN);
 	} else {
 		AST_LIST_TRAVERSE(&users, vmu, list) {
 			if(!strcasecmp(mb->user, vmu->imapuser)) {
-				ast_copy_string(pwd, vmu->imappassword, sizeof(pwd));
+				ast_copy_string(pwd, vmu->imappassword, MAILTMPLEN);
 				break;
 			}
 		}