diff --git a/ComApp/src/App/Views/ContactScreen.js b/ComApp/src/App/Views/ContactScreen.js
index 1b6539f..3a94557 100644
--- a/ComApp/src/App/Views/ContactScreen.js
+++ b/ComApp/src/App/Views/ContactScreen.js
@@ -266,7 +266,9 @@ class ContactScreen extends React.Component {
    */
   Item(contact) {
     const displayName =
-      String(contact.lastname ?? '').toUpperCase() + ' ' + contact.firstname;
+      String(contact.lastname ?? '').toUpperCase() +
+      ' ' +
+      (contact.firstname ?? '');
     return (
       <View style={styles.item}>
         <TouchableOpacity
@@ -277,7 +279,7 @@ class ContactScreen extends React.Component {
             })
           }>
           <Text style={{ ...styles.clickable, color: this.props.mainColor }}>
-            {contact.lastname && contact.firstname ? displayName : contact.id}
+            {contact.lastname || contact.firstname ? displayName : contact.id}
           </Text>
         </TouchableOpacity>
         <TouchableOpacity onPress={() => this.composeNewEmailTo(contact.email)}>