diff --git a/addons/account_peppol/i18n/account_peppol.pot b/addons/account_peppol/i18n/account_peppol.pot
index 4d170a8f7b3..c1c2c17dc44 100644
--- a/addons/account_peppol/i18n/account_peppol.pot
+++ b/addons/account_peppol/i18n/account_peppol.pot
@@ -332,6 +332,13 @@ msgstr ""
 msgid "Peppol error: %s"
 msgstr ""
 
+#. module: account_peppol
+#. odoo-python
+#: code:addons/account_peppol/models/account_edi_proxy_user.py:0
+#, python-format
+msgid "Peppol status update: %s"
+msgstr ""
+
 #. module: account_peppol
 #. odoo-python
 #: code:addons/account_peppol/models/account_edi_proxy_user.py:0
diff --git a/addons/account_peppol/models/account_edi_proxy_user.py b/addons/account_peppol/models/account_edi_proxy_user.py
index e2a434b700b..5c9b6dc8902 100644
--- a/addons/account_peppol/models/account_edi_proxy_user.py
+++ b/addons/account_peppol/models/account_edi_proxy_user.py
@@ -100,7 +100,7 @@ class AccountEdiProxyClientUser(models.Model):
 
                 enc_key = content["enc_key"]
                 document_content = content["document"]
-                filename = content["filename"]
+                filename = content["filename"] or 'attachment' # default to attachment, which should not usually happen
                 partner_endpoint = content["accounting_supplier_party"]
                 decoded_document = edi_user._decrypt_data(document_content, enc_key)
 
@@ -180,13 +180,22 @@ class AccountEdiProxyClientUser(models.Model):
             )
 
             for uuid, content in messages_to_process.items():
+                if uuid == 'error':
+                    # this rare edge case can happen if the participant is not active on the proxy side
+                    # in this case we can't get information about the invoices
+                    edi_user_moves.peppol_move_state = 'error'
+                    log_message = _("Peppol error: %s", content['message'])
+                    edi_user_moves._message_log_batch(bodies=dict((move.id, log_message) for move in edi_user_moves))
+                    continue
+
                 move = message_uuids[uuid]
                 if content.get('error'):
                     move.peppol_move_state = 'error'
-                    move._message_log(body=_('Peppol error: %s', content['error']['message']))
+                    move._message_log(body=_("Peppol error: %s", content['error']['message']))
                     continue
+
                 move.peppol_move_state = content['state']
-                move._message_log(body=_('Peppol update: %s', content['state']))
+                move._message_log(body=_('Peppol status update: %s', content['state']))
 
             if message_uuids:
                 edi_user._make_request(
@@ -196,7 +205,7 @@ class AccountEdiProxyClientUser(models.Model):
 
     def _cron_peppol_get_participant_status(self):
         edi_users = self.env['account_edi_proxy_client.user'].search(
-            [('company_id.account_peppol_proxy_state', '=', 'pending')])
+            [('company_id.account_peppol_proxy_state', 'in', ('pending', 'manually_approved'))])
 
         for edi_user in edi_users:
             try:
diff --git a/addons/account_peppol/views/res_partner_views.xml b/addons/account_peppol/views/res_partner_views.xml
index 38408f741d0..c31fcad4026 100644
--- a/addons/account_peppol/views/res_partner_views.xml
+++ b/addons/account_peppol/views/res_partner_views.xml
@@ -25,7 +25,7 @@
                         </div>
                         <div class="col-8 pt-0">
                             <button name="button_account_peppol_check_partner_endpoint"
-                                    class="btn btn-secondary pt-0"
+                                    class="btn btn-secondary"
                                     type="object"
                                     string="Verify"
                                     help="Verify partner's PEPPOL endpoint"/>