Cleaning up the admin users code
Merge pull request #51 from nickfrey/master

Cleaning up the admin users code