Better fix for ensureAdmin