Attempt fix for UserId Auth