added user check after checkToken
Merge branch 'master' of github.com:minsh/fancypants.feedback