diff --git a/account_credit_control/data/data.xml b/account_credit_control/data/data.xml
index 79a44ce25..a788f458f 100644
--- a/account_credit_control/data/data.xml
+++ b/account_credit_control/data/data.xml
@@ -3,7 +3,7 @@
     <!--Email template -->
     <record id="email_template_credit_control_base" model="mail.template">
         <field name="name">Credit Control Email</field>
-        <field name="email_from">${object.partner_id.company_id.email or ''}</field>
+        <field name="email_from">${user.company_id.email or ''}</field>
         <field name="subject">Credit Control:
             (${object.current_policy_level.name or 'n/a'})
         </field>
diff --git a/account_credit_control/models/credit_control_line.py b/account_credit_control/models/credit_control_line.py
index 2a113d0b6..a09e4ab19 100644
--- a/account_credit_control/models/credit_control_line.py
+++ b/account_credit_control/models/credit_control_line.py
@@ -250,3 +250,13 @@ class CreditControlLine(models.Model):
             'context': ctx,
             'target': 'new',
         }
+
+    def button_credit_control_line_form(self):
+        self.ensure_one()
+        action = self.env.ref(
+            'account_credit_control.credit_control_line_action')
+        form = self.env.ref('account_credit_control.credit_control_line_form')
+        action = action.read()[0]
+        action['views'] = [(form.id, 'form')]
+        action['res_id'] = self.id
+        return action
diff --git a/account_credit_control/views/credit_control_line.xml b/account_credit_control/views/credit_control_line.xml
index 1f0a7946f..714a6a60e 100644
--- a/account_credit_control/views/credit_control_line.xml
+++ b/account_credit_control/views/credit_control_line.xml
@@ -133,7 +133,8 @@
                   decoration-danger="state in ('error', 'email_error')"
                   decoration-muted="state == 'ignored'"
                   decoration-success="state == 'sent'">
-                <button name="action_sale_order_form" type="object" icon="fa-external-link" class="oe_stat_button"/>
+                <button name="button_credit_control_line_form"
+                        type="object" icon="fa-external-link" class="oe_stat_button"/>
                 <field name="date"/>
                 <field name="date_due"/>
                 <field name="level"/>