Process of tracking referral source is tedious

As far as I can tell, I have to look on a client's intake form for the referral source, and then add it to the demographics form, in order to track referral sources. I would love to find a more streamlined process. Seems counter-intuitive to have a 2-step process since the information is accessible and trackable from the one form.