Updated user login and User