refactor api admins
Merge branch 'hotfix/fix_admin_api'