diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserEntityFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserEntityFactory.kt
index c5c059eb..7873bf2f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserEntityFactory.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserEntityFactory.kt
@@ -31,12 +31,12 @@ internal object UserEntityFactory {
         }
         val roomMember = event.content.toModel<RoomMember>() ?: return null
         // We only use JOIN and INVITED memberships to create User data
-        if (roomMember.membership != Membership.JOIN || roomMember.membership != Membership.INVITE) {
+        if (roomMember.membership != Membership.JOIN && roomMember.membership != Membership.INVITE) {
             return null
         }
         return UserEntity(event.stateKey ?: "",
-                          roomMember.displayName ?: "",
-                          roomMember.avatarUrl ?: ""
+                roomMember.displayName ?: "",
+                roomMember.avatarUrl ?: ""
         )
     }