Fix password and user checking