Improve administrator detection for all systems.