diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index ad728cae483..3412d485b9f 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -122,7 +122,6 @@
 <!ENTITY pref_category_display_summary "Text, title bar, full-screen browsing">
 <!ENTITY pref_category_privacy_short "Privacy">
 <!ENTITY pref_category_privacy_summary "Control passwords, cookies, tracking, data">
-<!ENTITY pref_manage_logins "Manage logins">
 <!ENTITY pref_category_vendor "&vendorShortName;">
 <!ENTITY pref_category_vendor_summary "About &brandShortName;, FAQs, data choices">
 <!ENTITY pref_category_datareporting "Data choices">
@@ -142,7 +141,9 @@
 <!ENTITY pref_category_devtools_summary "Remote debugging, paint flashing">
 <!ENTITY pref_developer_paint_flashing "Paint flashing">
 <!ENTITY pref_developer_remotedebugging "Remote debugging">
+<!ENTITY pref_category_logins "Logins">
 <!ENTITY pref_remember_signons "Remember passwords">
+<!ENTITY pref_manage_logins "Manage logins">
 
 <!ENTITY pref_category_home "Home">
 <!ENTITY pref_category_home_summary "Customize your homepage">
diff --git a/mobile/android/base/resources/xml/preferences_privacy.xml b/mobile/android/base/resources/xml/preferences_privacy.xml
index 615f955d620..5468ea91cad 100644
--- a/mobile/android/base/resources/xml/preferences_privacy.xml
+++ b/mobile/android/base/resources/xml/preferences_privacy.xml
@@ -36,17 +36,21 @@
                     android:entryValues="@array/pref_cookies_values"
                     android:persistent="false" />
 
-    <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.signon.manage"
-                                                  android:title="@string/pref_manage_logins"
-                                                  url="about:passwords"/>
+    <PreferenceCategory android:title="@string/pref_category_logins">
 
-    <CheckBoxPreference android:key="signon.rememberSignons"
-                        android:title="@string/pref_remember_signons"
-                        android:persistent="false" />
+        <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.signon.manage"
+                                                      android:title="@string/pref_manage_logins"
+                                                      url="about:passwords"/>
 
-    <CheckBoxPreference android:key="privacy.masterpassword.enabled"
-                        android:title="@string/pref_use_master_password"
-                        android:persistent="false" />
+        <CheckBoxPreference android:key="signon.rememberSignons"
+                            android:title="@string/pref_remember_signons"
+                            android:persistent="false" />
+
+        <CheckBoxPreference android:key="privacy.masterpassword.enabled"
+                            android:title="@string/pref_use_master_password"
+                            android:persistent="false" />
+
+    </PreferenceCategory>
 
     <!-- keys prefixed with "android.not_a_preference." are not synced with Gecko -->
     <PreferenceCategory android:title="@string/pref_clear_private_data_category">
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index 5558febd639..d9e55ec2422 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -132,7 +132,6 @@
   <string name="pref_category_display_summary">&pref_category_display_summary;</string>
   <string name="pref_category_privacy_short">&pref_category_privacy_short;</string>
   <string name="pref_category_privacy_summary">&pref_category_privacy_summary;</string>
-  <string name="pref_manage_logins">&pref_manage_logins;</string>
   <string name="pref_category_vendor">&pref_category_vendor;</string>
   <string name="pref_category_vendor_summary">&pref_category_vendor_summary;</string>
   <string name="pref_category_datareporting">&pref_category_datareporting;</string>
@@ -175,7 +174,9 @@
 
   <string name="pref_learn_more">&pref_learn_more;</string>
 
+  <string name="pref_category_logins">&pref_category_logins;</string>
   <string name="pref_remember_signons">&pref_remember_signons;</string>
+  <string name="pref_manage_logins">&pref_manage_logins;</string>
 
   <string name="pref_cookies_menu">&pref_cookies_menu;</string>
   <string name="pref_cookies_accept_all">&pref_cookies_accept_all;</string>