Fix duplicate usernames
Merge pull request #1 from aesptux/development

Fix duplicate usernames