More work on controlling admin user