diff --git a/app/src/main/java/de/nils_beyer/android/Vertretungen/account/AccountSpinner.kt b/app/src/main/java/de/nils_beyer/android/Vertretungen/account/AccountSpinner.kt
index 4ec855b..7c957f8 100644
--- a/app/src/main/java/de/nils_beyer/android/Vertretungen/account/AccountSpinner.kt
+++ b/app/src/main/java/de/nils_beyer/android/Vertretungen/account/AccountSpinner.kt
@@ -83,12 +83,12 @@ class AccountSpinner(context: Context, attrs: AttributeSet) : AppCompatSpinner(c
         val accountList = filterAccounts(viewConfig)
         // check if update is needed
         for (i in accountList.indices) {
-            if (adapter.count - 1 < i) {
+            if (adapter.count < i) {
                 init()
                 break
             }
 
-            if (accountList[i] != adapter.getItem(i)) {
+            if (accountList[i].getTitle(context) != adapter.getItem(i)) {
                 init()
                 break
             }