Admin UI follow up.