diff --git a/src/components/forms/attendee-form/attendee-form.js b/src/components/forms/attendee-form/attendee-form.js
index 914351dbb..51bc422e2 100644
--- a/src/components/forms/attendee-form/attendee-form.js
+++ b/src/components/forms/attendee-form/attendee-form.js
@@ -200,8 +200,8 @@ class AttendeeForm extends React.Component {
                             getOptionLabel={
                                 (member) => {
                                     return member.hasOwnProperty("email") ?
-                                        `${member.first_name} ${member.last_name} (${member.email})`:
-                                        `${member.first_name} ${member.last_name} (${member.id})`;
+                                        `${member.first_name && member.last_name ? `${member.first_name} ${member.last_name} (${member.email})` : `${member.email}`}`:
+                                        `${member.first_name && member.last_name ? `${member.first_name} ${member.last_name}` : ''} (${member.id})`;
                                 }
                             }
                             onChange={this.handleChange}