more changes to login and user management