[OE-2738] tweaks to user admin system