Normalize_emails: can't change email address from user+x@gmail.com to user@gmail.com

Happy to put a pr-welcome on a fix here for now.