Admin check improvements