Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe

1 files changed, 2 insertions, 0 deletions

diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py

index 95250bad7d..b96cab5ef8 100644
--- a/synapse/push/mailer.py
+++ b/synapse/push/mailer.py
@@ -124,6 +124,8 @@ class Mailer(object):
             user_display_name = yield self.store.get_profile_displayname(
                 UserID.from_string(user_id).localpart
             )
+            if user_display_name is None:
+                user_display_name = user_id
         except StoreError:
             user_display_name = user_id