Bug fix for email