Merge "Don't allow removing admin to be added again" into nyc-dev