improve wrongpassword handling