diff --git a/play-services-core/src/main/java/org/microg/gms/ui/AccountsFragment.kt b/play-services-core/src/main/java/org/microg/gms/ui/AccountsFragment.kt
index 9031feacb8..d7a8078f43 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/AccountsFragment.kt
+++ b/play-services-core/src/main/java/org/microg/gms/ui/AccountsFragment.kt
@@ -124,30 +124,36 @@ class AccountsFragment : PreferenceFragmentCompat() {
         clearAccountPreferences()
 
         val preferenceCategory = findPreference<PreferenceCategory>("prefcat_current_accounts")
-
-        lifecycleScope.launch(Dispatchers.Main) {
-            accounts.forEach { account ->
-                val photo = PeopleManager.getOwnerAvatarBitmap(context, account.name, false)
-                val newPreference = Preference(requireContext()).apply {
-                    title = getDisplayName(account)
-                    summary = account.name
-                    icon = getCircleBitmapDrawable(photo)
-                    key = "account:${account.name}"
-                    order = 0
-
-                    setOnPreferenceClickListener {
-                        showConfirmationDialog(account.name)
-                        true
-                    }
-                }
-
-                if (preferenceCategory?.findPreference<Preference>(newPreference.key) == null) {
-                    if (photo == null) {
-                        withContext(Dispatchers.IO) {
-                            PeopleManager.getOwnerAvatarBitmap(context, account.name, true)
-                        }?.let { newPreference.icon = getCircleBitmapDrawable(it) }
+        val accountsCategoryVisible = accounts.isNotEmpty()
+
+        preferenceCategory?.let {
+            it.isVisible = accountsCategoryVisible
+            if (accountsCategoryVisible) {
+                lifecycleScope.launch(Dispatchers.Main) {
+                    accounts.forEach { account ->
+                        val photo = PeopleManager.getOwnerAvatarBitmap(context, account.name, false)
+                        val newPreference = Preference(requireContext()).apply {
+                            title = getDisplayName(account)
+                            summary = account.name
+                            icon = getCircleBitmapDrawable(photo)
+                            key = "account:${account.name}"
+                            order = 0
+
+                            setOnPreferenceClickListener {
+                                showConfirmationDialog(account.name)
+                                true
+                            }
+                        }
+
+                        if (preferenceCategory.findPreference<Preference>(newPreference.key) == null) {
+                            if (photo == null) {
+                                withContext(Dispatchers.IO) {
+                                    PeopleManager.getOwnerAvatarBitmap(context, account.name, true)
+                                }?.let { newPreference.icon = getCircleBitmapDrawable(it) }
+                            }
+                            preferenceCategory.addPreference(newPreference)
+                        }
                     }
-                    preferenceCategory?.addPreference(newPreference)
                 }
             }
         }
diff --git a/play-services-core/src/main/res/values-pt-rBR/strings.xml b/play-services-core/src/main/res/values-pt-rBR/strings.xml
index 0aec7dbf36..09282c1bdf 100644
--- a/play-services-core/src/main/res/values-pt-rBR/strings.xml
+++ b/play-services-core/src/main/res/values-pt-rBR/strings.xml
@@ -181,7 +181,7 @@ Isso pode levar alguns minutos."</string>
     <string name="dialog_message_remove_account">Tem certeza de que deseja remover esta conta?\n\nAlguns serviços e funções não estarão disponíveis\n\nSeus dados não serão perdidos</string>
     <string name="dialog_confirm_button">Remover</string>
     <string name="dialog_cancel_button">Cancelar</string>
-    <string name="toast_remove_account_success">%s removida</string>
+    <string name="toast_remove_account_success">Conta %s removida</string>
 
     <!-- Settings options strings-->
 
diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
index e81936ec69..7b474a7408 100644
--- a/play-services-core/src/main/res/values/strings.xml
+++ b/play-services-core/src/main/res/values/strings.xml
@@ -192,7 +192,7 @@ This can take a couple of minutes"</string>
     <string name="dialog_message_remove_account">Are you sure you want to remove this account?\n\nSome services and functions will be unavailable\n\nYour data will not be lost</string>
     <string name="dialog_confirm_button">Remove</string>
     <string name="dialog_cancel_button">Cancel</string>
-    <string name="toast_remove_account_success">%s removed</string>
+    <string name="toast_remove_account_success">Account %s removed</string>
 
     <!-- Settings options strings-->
 
diff --git a/play-services-core/src/main/res/xml/preferences_accounts.xml b/play-services-core/src/main/res/xml/preferences_accounts.xml
index 23c600c377..baec84c8c4 100644
--- a/play-services-core/src/main/res/xml/preferences_accounts.xml
+++ b/play-services-core/src/main/res/xml/preferences_accounts.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory
         android:key="prefcat_current_accounts"
@@ -27,13 +26,13 @@
     <PreferenceCategory android:title="@string/prefcat_youtube_activity">
 
         <Preference
-            android:key="pref_manage_history"
             android:icon="@drawable/ic_youtube_history"
+            android:key="pref_manage_history"
             android:title="@string/pref_manage_all_history" />
 
         <Preference
-            android:key="pref_your_data"
             android:icon="@drawable/ic_youtube_data"
+            android:key="pref_your_data"
             android:title="@string/pref_data_in_youtube" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file