Improve UI for superusers (bug 1100533)