fix duplicate user creation, wrong token relation and redundant code
Merge branch 'dev'