Alright, so consensus would be: Remove the `if` and always add `from_email` to template context. Also add it please to the default template. Thank you!