Retry addUser if email taken, closes #547
Merge pull request #568 from knownasilya/addUser-email

Retry addUser if email taken, closes #547