Admin PM fix attempt

Attempts to more accurately test rights for admin PM. Compiled only. Not
tested.