diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java
index 73cf34613..a7b49be04 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java
@@ -82,7 +82,7 @@ public class AdvancedUserItem extends AbstractFlexibleItem<AdvancedUserItem.User
         return participant;
     }
 
-    public User getEntity() {
+    public User getUser() {
         return user;
     }
 
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.kt b/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.kt
index 43e957b1b..b4ac8e152 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.kt
@@ -85,7 +85,7 @@ class SwitchAccountController(args: Bundle? = null) :
 
     private val onSwitchItemClickListener = FlexibleAdapter.OnItemClickListener { _, position ->
         if (userItems.size > position) {
-            val user = (userItems[position] as AdvancedUserItem).entity
+            val user = (userItems[position] as AdvancedUserItem).user
 
             if (userManager.setUserAsActive(user).blockingGet()) {
                 cookieManager.cookieStore.removeAll()
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
index c56689640..c78db0e4c 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
@@ -275,7 +275,7 @@ public class ChooseAccountDialogFragment extends DialogFragment {
             @Override
             public boolean onItemClick(View view, int position) {
                 if (userItems.size() > position) {
-                    User user = (userItems.get(position)).getEntity();
+                    User user = (userItems.get(position)).getUser();
 
                     if (userManager.setUserAsActive(user).blockingGet()) {
                         cookieManager.getCookieStore().removeAll();