Fix for empty emails