diff --git a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleStateProvider.kt b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleStateProvider.kt
index 38ef157df2..ff1dc5c4a9 100644
--- a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleStateProvider.kt
+++ b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleStateProvider.kt
@@ -33,11 +33,11 @@ internal class DefaultInvitePeopleStateProvider : PreviewParameterProvider<Defau
                 ),
                 searchResults = SearchBarResultState.Results(
                     persistentListOf(
-                        InvitableUser(aMatrixUser("@alice:server.org")),
-                        InvitableUser(aMatrixUser("@bob:server.org", "Bob")),
-                        InvitableUser(aMatrixUser("@carol:server.org", "Carol"), isSelected = true),
-                        InvitableUser(aMatrixUser("@eve:server.org", "Eve"), isSelected = true, isAlreadyJoined = true),
-                        InvitableUser(aMatrixUser("@justin:server.org", "Justin"), isSelected = true, isAlreadyInvited = true),
+                        anInvitableUser(aMatrixUser("@alice:server.org")),
+                        anInvitableUser(aMatrixUser("@bob:server.org", "Bob")),
+                        anInvitableUser(aMatrixUser("@carol:server.org", "Carol"), isSelected = true),
+                        anInvitableUser(aMatrixUser("@eve:server.org", "Eve"), isSelected = true, isAlreadyJoined = true),
+                        anInvitableUser(aMatrixUser("@justin:server.org", "Justin"), isSelected = true, isAlreadyInvited = true),
                     )
                 )
             ),
@@ -50,8 +50,8 @@ internal class DefaultInvitePeopleStateProvider : PreviewParameterProvider<Defau
                 ),
                 searchResults = SearchBarResultState.Results(
                     persistentListOf(
-                        InvitableUser(aMatrixUser("@alice:server.org"), isUnresolved = true),
-                        InvitableUser(aMatrixUser("@bob:server.org", "Bob")),
+                        anInvitableUser(aMatrixUser("@alice:server.org"), isUnresolved = true),
+                        anInvitableUser(aMatrixUser("@bob:server.org", "Bob")),
                     )
                 )
             ),
@@ -61,7 +61,7 @@ internal class DefaultInvitePeopleStateProvider : PreviewParameterProvider<Defau
                 searchQuery = "@alice:server.org",
                 searchResults = SearchBarResultState.Results(
                     persistentListOf(
-                        InvitableUser(aMatrixUser("@alice:server.org"), isUnresolved = true),
+                        anInvitableUser(aMatrixUser("@alice:server.org"), isUnresolved = true),
                     )
                 ),
                 showSearchLoader = true,
@@ -69,6 +69,20 @@ internal class DefaultInvitePeopleStateProvider : PreviewParameterProvider<Defau
         )
 }
 
+private fun anInvitableUser(
+    matrixUser: MatrixUser,
+    isSelected: Boolean = false,
+    isAlreadyJoined: Boolean = false,
+    isAlreadyInvited: Boolean = false,
+    isUnresolved: Boolean = false,
+) = InvitableUser(
+    matrixUser = matrixUser,
+    isSelected = isSelected,
+    isAlreadyJoined = isAlreadyJoined,
+    isAlreadyInvited = isAlreadyInvited,
+    isUnresolved = isUnresolved,
+)
+
 private fun aDefaultInvitePeopleState(
     canInvite: Boolean = false,
     searchQuery: String = "",
diff --git a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitableUser.kt b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitableUser.kt
index b2b9943e64..7dfd6a0f36 100644
--- a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitableUser.kt
+++ b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitableUser.kt
@@ -11,8 +11,8 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 
 data class InvitableUser(
     val matrixUser: MatrixUser,
-    val isSelected: Boolean = false,
-    val isAlreadyJoined: Boolean = false,
-    val isAlreadyInvited: Boolean = false,
-    val isUnresolved: Boolean = false,
+    val isSelected: Boolean,
+    val isAlreadyJoined: Boolean,
+    val isAlreadyInvited: Boolean,
+    val isUnresolved: Boolean,
 )