Add security admin checks
Merge branch 'improve-admin'