Clearer message
Fixing up some side errors and making sure password is always hidden