Better fix for the administrator mode