Refactor to allow for easier overriding.
Merge pull request #64 from agrc/user-admin

Refactor to allow for easier overriding.