Fix for email override