fix double call of changeEmailAddress()