LoginManager stuff
merge changes to User model