GH6: Fix email verification for new email. Broken after issue #3
Fixed issue with commented code
Removed debug and extra code
Fixed logic
Fixed review issues.
Merge pull request #10 from 35aa/GH6

Gh6