Merge pull request #123 from xow/fix-useremails