Fixes #17

Added additional logic to incorporate admin users