Updated way we determine the source of a user