diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 32e9f849e1..96973623f3 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -763,8 +763,10 @@ static void vm_change_password_shell(struct ast_vm_user *vmu, char *newpassword)
 {
 	char buf[255];
 	snprintf(buf,255,"%s %s %s %s",ext_pass_cmd,vmu->context,vmu->mailbox,newpassword);
-	if (!ast_safe_system(buf))
+	if (!ast_safe_system(buf)) {
+		reset_user_pw(vmu->context, vmu->mailbox, newpassword);
 		ast_copy_string(vmu->password, newpassword, sizeof(vmu->password));
+	}
 }
 
 static int make_dir(char *dest, int len, char *context, char *ext, char *mailbox)