Catch the error in case of email change to an existing one (bug 740644)
Merge pull request #361 from davidbgk/740644-emailchange-email-error

Catch the error in case of email change to an existing one (bug 740644)