Fix for email