Distinguish between admin and user API call

Fixes #268
Merge pull request #269 from TheSerapher/issue-268

Distinguish between admin and user API call