Fix for the password issue