Merge pull request #1052 from pixelated/email-recovery-code