Fixed a situation where multiple email addresses could be associated with one user when that user changes their email address.