Added back the code for checking for passwords