Modified to support auth first user journey