EHO-364 user admin uses new style entry selector