Fix to let us create tenants in Admin UI