diff --git a/addons/account/data/mail_template_data.xml b/addons/account/data/mail_template_data.xml
index 13f5c49d452..230b5e8e481 100644
--- a/addons/account/data/mail_template_data.xml
+++ b/addons/account/data/mail_template_data.xml
@@ -8,7 +8,7 @@
         <record id="email_template_edi_invoice" model="mail.template">
             <field name="name">Invoice: Sending</field>
             <field name="model_id" ref="account.model_account_move"/>
-            <field name="email_from">{{ (object.invoice_user_id.email_formatted or user.email_formatted) }}</field>
+            <field name="email_from">{{ (object.invoice_user_id.email_formatted or object.company_id.email_formatted or user.email_formatted) }}</field>
             <field name="partner_to">{{ object.partner_id.id }}</field>
             <field name="subject">{{ object.company_id.name }} Invoice (Ref {{ object.name or 'n/a' }})</field>
             <field name="description">Sent to customers with their invoices in attachment</field>
@@ -91,7 +91,7 @@
         <record id="email_template_edi_credit_note" model="mail.template">
             <field name="name">Credit Note: Sending</field>
             <field name="model_id" ref="account.model_account_move"/>
-            <field name="email_from">{{ (object.invoice_user_id.email_formatted or user.email_formatted) }}</field>
+            <field name="email_from">{{ (object.invoice_user_id.email_formatted or object.company_id.email_formatted or user.email_formatted) }}</field>
             <field name="partner_to">{{ object.partner_id.id }}</field>
             <field name="subject">{{ object.company_id.name }} Credit Note (Ref {{ object.name or 'n/a' }})</field>
             <field name="description">Sent to customers with the credit note in attachment</field>
diff --git a/addons/auth_signup/data/mail_template_data.xml b/addons/auth_signup/data/mail_template_data.xml
index 19b35598938..b25859d5531 100644
--- a/addons/auth_signup/data/mail_template_data.xml
+++ b/addons/auth_signup/data/mail_template_data.xml
@@ -198,7 +198,7 @@
             <field name="name">Settings: Unregistered User Reminder</field>
             <field name="model_id" ref="base.model_res_users"/>
             <field name="subject">Reminder for unregistered users</field>
-            <field name="email_from">{{ object.company_id.partner_id.email_formatted }}</field>
+            <field name="email_from">{{ (object.company_id.email_formatted or user.email_formatted) }}</field>
             <field name="email_to">{{ object.email_formatted }}</field>
             <field name="description">Sent automatically to admin if new user haven't responded to the invitation</field>
             <field name="body_html" type="html">
diff --git a/addons/auth_totp_mail/data/mail_template_data.xml b/addons/auth_totp_mail/data/mail_template_data.xml
index 0694cc216ee..b30105ca555 100644
--- a/addons/auth_totp_mail/data/mail_template_data.xml
+++ b/addons/auth_totp_mail/data/mail_template_data.xml
@@ -4,6 +4,7 @@
     <record id="mail_template_totp_invite" model="mail.template">
         <field name="name">Settings: 2Fa Invitation</field>
         <field name="model_id" ref="base.model_res_users" />
+        <field name="email_from">{{ (object.company_id.email_formatted or user.email_formatted) }}</field>
         <field name="subject">Invitation to activate two-factor authentication on your Odoo account</field>
         <field name="partner_to">{{ object.partner_id.id }}</field>
         <field name="lang">{{ object.partner_id.lang }}</field>
diff --git a/addons/sale/data/mail_template_data.xml b/addons/sale/data/mail_template_data.xml
index aa204883bc1..d5ae9526ed5 100644
--- a/addons/sale/data/mail_template_data.xml
+++ b/addons/sale/data/mail_template_data.xml
@@ -5,7 +5,7 @@
             <field name="name">Sales: Send Quotation</field>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field name="subject">{{ object.company_id.name }} {{ object.state in ('draft', 'sent') and (ctx.get('proforma') and 'Proforma' or 'Quotation') or 'Order' }} (Ref {{ object.name or 'n/a' }})</field>
-            <field name="email_from">{{ (object.user_id.email_formatted or user.email_formatted) }}</field>
+            <field name="email_from">{{ (object.user_id.email_formatted or object.company_id.email_formatted or user.email_formatted) }}</field>
             <field name="partner_to">{{ object.partner_id.id }}</field>
             <field name="description">Used by salespeople when they send quotations or proforma to prospects</field>
             <field name="body_html" type="html">
@@ -48,7 +48,7 @@
             <field name="name">Sales: Order Confirmation</field>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field name="subject">{{ object.company_id.name }} {{ (object.get_portal_last_transaction().state == 'pending') and 'Pending Order' or 'Order' }} (Ref {{ object.name or 'n/a' }})</field>
-            <field name="email_from">{{ (object.user_id.email_formatted or user.email_formatted) }}</field>
+            <field name="email_from">{{ (object.user_id.email_formatted or object.company_id.email_formatted or user.email_formatted) }}</field>
             <field name="partner_to">{{ object.partner_id.id }}</field>
             <field name="description">Sent to customers on order confirmation</field>
             <field name="body_html" type="html">
@@ -298,7 +298,7 @@
             <field name="name">Sales: Order Cancellation</field>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field name="subject">{{ object.company_id.name }} {{ object.type_name }} Cancelled (Ref {{ object.name or 'n/a' }})</field>
-            <field name="email_from">{{ (object.user_id.email_formatted or user.email_formatted) }}</field>
+            <field name="email_from">{{ (object.user_id.email_formatted or object.company_id.email_formatted or user.email_formatted) }}</field>
             <field name="partner_to">{{ object.partner_id.id }}</field>
             <field name="description">Sent automatically to customers when you cancel an order</field>
             <field name="body_html" type="html">
diff --git a/addons/website_sale/data/mail_template_data.xml b/addons/website_sale/data/mail_template_data.xml
index 58ac5ac7f15..4902c0a62e8 100644
--- a/addons/website_sale/data/mail_template_data.xml
+++ b/addons/website_sale/data/mail_template_data.xml
@@ -5,7 +5,7 @@
             <field name="name">Ecommerce: Cart Recovery</field>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field name="subject">You left items in your cart!</field>
-            <field name="email_from">{{ (object.user_id.email_formatted or user.email_formatted or '') }}</field>
+            <field name="email_from">{{ (object.user_id.email_formatted or object.company_id.email_formatted or user.email_formatted or '') }}</field>
             <field name="partner_to">{{ object.partner_id.id }}</field>
             <field name="description">If the setting is set, sent to authenticated visitors who abandoned their cart</field>
             <field name="body_html" type="html">