CRM-13929 Refactor current employer field