diff --git a/src/pretix/base/models/waitinglist.py b/src/pretix/base/models/waitinglist.py
index 5c650c378e..99ab0ac9a9 100644
--- a/src/pretix/base/models/waitinglist.py
+++ b/src/pretix/base/models/waitinglist.py
@@ -188,6 +188,9 @@ class WaitingListEntry(LoggedModel):
             raise WaitingListException(_('This entry is anonymized and can no longer be used.'))
 
         with transaction.atomic():
+            e = self.email
+            if self.name:
+                e += ' / ' + self.name
             v = Voucher.objects.create(
                 event=self.event,
                 max_usages=1,
@@ -196,7 +199,7 @@ class WaitingListEntry(LoggedModel):
                 variation=self.variation,
                 tag='waiting-list',
                 comment=_('Automatically created from waiting list entry for {email}').format(
-                    email=self.email
+                    email=e
                 ),
                 block_quota=True,
                 subevent=self.subevent,
diff --git a/src/tests/base/test_waitinglist.py b/src/tests/base/test_waitinglist.py
index f61b093539..b2c3ba7b10 100644
--- a/src/tests/base/test_waitinglist.py
+++ b/src/tests/base/test_waitinglist.py
@@ -120,13 +120,17 @@ class WaitingListTestCase(TestCase):
     def test_send_custom_validity(self):
         self.event.settings.set('waiting_list_hours', 24)
         wle = WaitingListEntry.objects.create(
-            event=self.event, item=self.item2, variation=self.var1, email='foo@bar.com'
+            event=self.event, item=self.item2, variation=self.var1, email='foo@bar.com',
+            name_parts={'_legacy': 'Max'}
         )
         wle.send_voucher()
         wle.refresh_from_db()
 
         assert 3600 * 23 < (wle.voucher.valid_until - now()).seconds < 3600 * 24
 
+        assert 'foo@bar.com' in wle.voucher.comment
+        assert 'Max' in wle.voucher.comment
+
     def test_send_auto(self):
         with scope(organizer=self.o):
             self.quota.variations.add(self.var1)