Updated for user login