CLC-3153 - Fix design of 'Add People' integration