[OE-3686] tweaks for admin system