Adding in the admin thing so that it works more better
Merge branch 'hotfix/cpdadmin'