Fix the password field

THIS IS A BIG ONE