diff --git a/indico/modules/events/fields.py b/indico/modules/events/fields.py
index fdc53698268..d79405a4e6a 100644
--- a/indico/modules/events/fields.py
+++ b/indico/modules/events/fields.py
@@ -117,8 +117,8 @@ def name_format(self):
         from indico.modules.users.models.users import NameFormat
         name_format = layout_settings.get(self.event, 'name_format') if self.event else None
         if name_format is None and session.user:
-            name_format = NameFormat(session.user.settings.get('name_format'))
-        return name_format or NameFormat.first_last
+            name_format = session.user.settings.get('name_format')
+        return name_format if name_format is not None else NameFormat.first_last
 
     @property
     def validate_email_url(self):