diff --git a/app/src/main/java/com/nextcloud/talk/users/UserManager.kt b/app/src/main/java/com/nextcloud/talk/users/UserManager.kt
index ba3c0e3c9..ea5b3251d 100644
--- a/app/src/main/java/com/nextcloud/talk/users/UserManager.kt
+++ b/app/src/main/java/com/nextcloud/talk/users/UserManager.kt
@@ -45,14 +45,13 @@ class UserManager internal constructor(private val userRepository: UsersReposito
         val results = userRepository.getUsersNotScheduledForDeletion()
 
         return results.map { users ->
-            var result: User? = null
-            if (users.isNotEmpty()) {
-                val user = users[0]
-                user.current = true
-                userRepository.updateUser(user)
-                result = user
-            }
-            result
+            users
+                .firstOrNull()
+                ?.apply {
+                    current = true
+                }?.also { user ->
+                    userRepository.updateUser(user)
+                }
         }
     }