diff --git a/backend/api/emails.py b/backend/api/emails.py index 47c0ed52a..a7d6618ef 100644 --- a/backend/api/emails.py +++ b/backend/api/emails.py @@ -26,14 +26,18 @@ def _frontend_url(): def get_org_member_name(org_member): - social_acc = org_member.user.socialaccount_set.first() + user = org_member.user - member_name = social_acc.extra_data.get("name") + social_acc = user.socialaccount_set.first() + if social_acc: + name = (social_acc.extra_data or {}).get("name") + if name: + return name - if member_name is None: - member_name = org_member.user.email + if user.full_name: + return user.full_name - return member_name + return user.email def send_email(subject, recipient_list, template_name, context):