Fix groups workflow

Makes some changes to accommodate the AC's use of groups for adding staff.