Pull company user for current site first [PD-619]