WP-2351 Another try at changing the group for the leave fields