From 8e6925c0377b22a55f25e800d4e3f54684ce741d Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Thu, 6 May 2021 20:18:38 +0200
Subject: [PATCH] Fix logging of SMTPDataErrors (PRETIXEU-3X7)

---
 src/pretix/base/services/mail.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pretix/base/services/mail.py b/src/pretix/base/services/mail.py
index 32bac889d7..29604fc627 100644
--- a/src/pretix/base/services/mail.py
+++ b/src/pretix/base/services/mail.py
@@ -369,13 +369,14 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
         backend = get_connection(fail_silently=False)
         cm = lambda: scopes_disabled()  # noqa
 
-    log_target = order or user or customer
+    log_target = user or customer
 
     with cm():
         if event:
             if order:
                 try:
                     order = event.orders.get(pk=order)
+                    log_target = order
                 except Order.DoesNotExist:
                     order = None
                 else: