improve admin checks