diff --git a/NEWS b/NEWS
index 3c7533ebc..1b44dd66a 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,7 @@ Bug fixes
  - [web] don't hide compose button if messages list is visible
  - [web] fixed next/previous slots with external attendees
  - [web] fixed restoration of sub mailbox when reloading page
+ - [web] use matching address of attendee (#4473)
  - [core] allow super users to modify any event (#4216)
  - [core] correctly handle the full cert chain in S/MIME
  - [core] handle multidays events in freebusy data
diff --git a/UI/WebServerResources/js/Scheduler/Attendees.service.js b/UI/WebServerResources/js/Scheduler/Attendees.service.js
index 04f8448ec..1e9fe5701 100644
--- a/UI/WebServerResources/js/Scheduler/Attendees.service.js
+++ b/UI/WebServerResources/js/Scheduler/Attendees.service.js
@@ -134,7 +134,7 @@
     if (card) {
       if (!this.component.attendees || (options && options.organizerCalendar)) {
         // No attendee yet; initialize the organizer
-        this.initOrganizer(options? options.organizerCalendar : undefined);
+        this.initOrganizer(options? options.organizerCalendar : null);
       }
       if (card.$isList({expandable: true})) {
         // Decompose list members
@@ -143,7 +143,7 @@
           _.forEach(list.refs, function(ref) {
             attendee = {
               name: ref.c_cn,
-              email: ref.$preferredEmail(options? options.partial : undefined),
+              email: ref.$preferredEmail(options? options.partial : null),
               role: Attendees.ROLES.REQ_PARTICIPANT,
               partstat: 'needs-action',
               uid: ref.c_uid,
@@ -172,7 +172,7 @@
           isGroup: card.$isList(),
           isResource: card.isresource,
           name: card.c_cn,
-          email: card.$preferredEmail(),
+          email: card.$$email,
           role: Attendees.ROLES.REQ_PARTICIPANT,
           partstat: 'needs-action',
           $avatarIcon: card.$avatarIcon