[UPDATE] moved user rights checks
Merge pull request #32 from iAmShorty/user-rights

[UPDATE] moved user rights checks