E-mail address fix