Fix non sysadmin handling for (un)feature