#2778 - Tenants are not displayed in the Admin UI.
Review fixes for admin UI bugs