diff --git a/CHANGELOG b/CHANGELOG
index 95146653bf..26a6f2f5b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Rename generate_message button to sepa_generate_message
+
 Version 6.2.0 - 2021-11-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/payment.py b/payment.py
index 0fc387a050..c99c86e9a1 100644
--- a/payment.py
+++ b/payment.py
@@ -195,7 +195,7 @@ class Group(metaclass=PoolMeta):
     def __setup__(cls):
         super(Group, cls).__setup__()
         cls._buttons.update({
-                'generate_message': {
+                'sepa_generate_message': {
                     'invisible': Eval('process_method') != 'sepa',
                     'depends': ['process_method'],
                     },
@@ -239,14 +239,16 @@ class Group(metaclass=PoolMeta):
                         gettext('account_payment_sepa'
                             '.msg_payment_process_no_iban',
                             payment=payment.rec_name))
-        self.generate_message(_save=False)
+        self.sepa_generate_message(_save=False)
 
     @dualmethod
     @ModelView.button
-    def generate_message(cls, groups, _save=True):
+    def sepa_generate_message(cls, groups, _save=True):
         pool = Pool()
         Message = pool.get('account.payment.sepa.message')
         for group in groups:
+            if group.journal.process_method != 'sepa':
+                continue
             tmpl = group.get_sepa_template()
             if not tmpl:
                 raise NotImplementedError
diff --git a/payment.xml b/payment.xml
index 427eaa4110..42df7da6cb 100644
--- a/payment.xml
+++ b/payment.xml
@@ -298,8 +298,8 @@ this repository contains the full copyright notices and license terms. -->
         </record>
 
         <record model="ir.model.button" id="group_generate_message_button">
-            <field name="name">generate_message</field>
-            <field name="string">Generate Message</field>
+            <field name="name">sepa_generate_message</field>
+            <field name="string">Generate SEPA Message</field>
             <field name="model"
                 search="[('model', '=', 'account.payment.group')]"/>
         </record>
diff --git a/view/payment_group_form.xml b/view/payment_group_form.xml
index 8a0e9d8e74..13c5338361 100644
--- a/view/payment_group_form.xml
+++ b/view/payment_group_form.xml
@@ -4,6 +4,6 @@ this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="/form/field[@name='kind']" position="after">
         <field name="sepa_messages" colspan="4"/>
-        <button name="generate_message" colspan="4"/>
+        <button name="sepa_generate_message" colspan="4"/>
     </xpath>
 </data>