DRYer, better code
Feature flag to disable adding Organisation Admin