Changes to User and the login process

YARS!!