diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
index ac130497..e432f5e3 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
@@ -18,6 +18,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import ani.dantotsu.BuildConfig
 import ani.dantotsu.R
+import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.copyToClipboard
 import ani.dantotsu.databinding.ActivitySettingsBinding
 import ani.dantotsu.initActivity
@@ -159,7 +160,10 @@ class SettingsActivity : AppCompatActivity() {
                         desc = getString(R.string.alsettings_desc),
                         icon = R.drawable.ic_anilist,
                         onClick = {
-                            startActivity(Intent(context, SettingsAnilistActivity::class.java))
+                            lifecycleScope.launch {
+                                Anilist.query.getUserData()
+                                startActivity(Intent(context, SettingsAnilistActivity::class.java))
+                            }
                         },
                         isActivity = true
                     ),
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsAnilistActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsAnilistActivity.kt
index 7d7816d2..d2819ebe 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsAnilistActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsAnilistActivity.kt
@@ -22,6 +22,12 @@ class SettingsAnilistActivity : AppCompatActivity() {
     private lateinit var binding: ActivitySettingsAnilistBinding
     private lateinit var anilistMutations: AnilistMutations
 
+    enum class Format {
+        ENGLISH,
+        ROMANJI,
+        NATIVE
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         ThemeManager(this).applyTheme()
@@ -61,29 +67,10 @@ class SettingsAnilistActivity : AppCompatActivity() {
                 "Native (進撃の巨人)"
             )
 
-            val staffNameLang = listOf(
-                "Romaji, Western Order (Killua Zoldyck)",
-                "Romaji (Zoldyck Killua)",
-                "Native (キルア=ゾルディック)"
-            )
+            val currentTitleLang = PrefManager.getVal<String>(PrefName.AnilistTitleLanguage)
+            val titleFormat = Format.entries.firstOrNull { it.name == currentTitleLang } ?: Format.ENGLISH
 
-            val currentTitleLang = PrefManager.getVal(PrefName.AnilistTitleLanguage, "ENGLISH")
-            val currentStaffNameLang = PrefManager.getVal(PrefName.AnilistStaffNameLanguage, "ENGLISH")
-
-            val titleLangIndex = when (currentTitleLang) {
-                "ENGLISH" -> 0
-                "ROMAJI" -> 1
-                "NATIVE" -> 2
-                else -> 0
-            }
-            val staffNameLangIndex = when (currentStaffNameLang) {
-                "ENGLISH" -> 0
-                "ROMAJI" -> 1
-                "NATIVE" -> 2
-                else -> 0
-            }
-
-            settingsAnilistTitleLanguage.setText(titleLang[titleLangIndex])
+            settingsAnilistTitleLanguage.setText(titleLang[titleFormat.ordinal])
             settingsAnilistTitleLanguage.setAdapter(
                 ArrayAdapter(context, R.layout.item_dropdown, titleLang)
             )
@@ -101,7 +88,17 @@ class SettingsAnilistActivity : AppCompatActivity() {
                 settingsAnilistTitleLanguage.clearFocus()
             }
 
-            settingsAnilistStaffLanguage.setText(staffNameLang[staffNameLangIndex])
+
+            val staffNameLang = listOf(
+                "Romaji, Western Order (Killua Zoldyck)",
+                "Romaji (Zoldyck Killua)",
+                "Native (キルア=ゾルディック)"
+            )
+
+            val currentStaffNameLang = PrefManager.getVal<String>(PrefName.AnilistStaffNameLanguage)
+            val staffNameFormat = Format.entries.firstOrNull { it.name == currentStaffNameLang } ?: Format.ENGLISH
+
+            settingsAnilistStaffLanguage.setText(staffNameLang[staffNameFormat.ordinal])
             settingsAnilistStaffLanguage.setAdapter(
                 ArrayAdapter(context, R.layout.item_dropdown, staffNameLang)
             )
@@ -119,7 +116,6 @@ class SettingsAnilistActivity : AppCompatActivity() {
                 settingsAnilistStaffLanguage.clearFocus()
             }
 
-            // Fetch and set other settings
             val displayAdultContent = PrefManager.getVal(PrefName.AnilistDisplayAdultContent, false)
             val airingNotifications = PrefManager.getVal(PrefName.AnilistAiringNotifications, false)
             val restrictMessagesToFollowing = PrefManager.getVal(PrefName.AnilistRestrictMessagesToFollowing, false)
diff --git a/app/src/main/res/layout/activity_settings_anilist.xml b/app/src/main/res/layout/activity_settings_anilist.xml
index 6ba84080..8c4984a4 100644
--- a/app/src/main/res/layout/activity_settings_anilist.xml
+++ b/app/src/main/res/layout/activity_settings_anilist.xml
@@ -84,7 +84,7 @@
             app:startIconDrawable="@drawable/ic_round_dns_24">
 
             <AutoCompleteTextView
-                android:id="@+id/settings_anilist_title_language"
+                android:id="@+id/settingsAnilistTitleLanguage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"