Merge pull request #1812 from zed-industries/fix-500-error-on-user-join

Fix duplicate key error that occurs when a user joins that is already in the db