Email address fix