Fix issue with emails