Improve admin flow