diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/MeteroidNavigation.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/MeteroidNavigation.kt
index 3b5cab63ecc5fc144db55d5569abc5816817b790..267caa347782514dbda46843504bb5ccb95d4bc9 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/MeteroidNavigation.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/MeteroidNavigation.kt
@@ -120,6 +120,7 @@ fun MeteroidNavigation(navController: NavController, viewModel: NavigationViewMo
                       saveState = false
                     }
                   }
+                  viewModel.selectUser(entry.user.serverId, entry.user.userId)
                 }
               }
 
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/NavigationViewModel.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/NavigationViewModel.kt
index 45d298cc292d10a97fce809864d002d320403d0b..e94f2be97aefa1a7ef00bb8e0afb42a19f492b1e 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/NavigationViewModel.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/NavigationViewModel.kt
@@ -24,6 +24,7 @@
 
 package de.chaosdorf.meteroid.ui.navigation
 
+import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -44,7 +45,8 @@ class NavigationViewModel @Inject constructor(
   userRepository: UserRepository,
   pinnedUserRepository: PinnedUserRepository,
   syncManager: SyncManager,
-  private val accountProvider: AccountProvider
+  private val accountProvider: AccountProvider,
+  private val preferences: AccountPreferences
 ) : ViewModel() {
   val expanded = MutableStateFlow(false)
   val account = MutableStateFlow<AccountPreferences.State?>(null)
@@ -117,4 +119,11 @@ class NavigationViewModel @Inject constructor(
       accountProvider.togglePin(serverId, userId)
     }
   }
+
+  fun selectUser(serverId: ServerId, userId: UserId) {
+    Log.i("UserListViewModel", "Updating AccountPreferences: $serverId $userId")
+    viewModelScope.launch {
+      preferences.setUser(serverId, userId)
+    }
+  }
 }
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/userlist/UserListViewModel.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/userlist/UserListViewModel.kt
index 22a6a097db053957c3df05fd2b0f2d0d8f3bf982..e50d80dd4258292317e8ba0614a2be15906b339f 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/userlist/UserListViewModel.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/userlist/UserListViewModel.kt
@@ -64,7 +64,6 @@ class UserListViewModel @Inject constructor(
   fun selectUser(serverId: ServerId, userId: UserId) {
     Log.i("UserListViewModel", "Updating AccountPreferences: $serverId $userId")
     viewModelScope.launch {
-
       preferences.setUser(serverId, userId)
     }
   }