Fix issue with e-mail