FX-21: fix admin