diff --git a/res/values/strings.xml b/res/values/strings.xml
index 02f94ce..2d08c79 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -386,6 +386,8 @@
     <string name="pref_autologin_summary">Sign into Google sites automatically using <xliff:g>%s</xliff:g></string>
     <!-- Message shown during auto login [CHAR-LIMIT=none] -->
     <string name="pref_autologin_progress">Signing into Google sites using <xliff:g>%s</xliff:g></string>
+    <!-- Option in account list to disable autologin [CHAR-LIMIT=50] -->
+    <string name="pref_autologin_disable">Don\'t sign in automatically</string>
 
     <!-- Heading for the AutoFill profile editor to tell the user what AutoFill does and why they should fill out the profile. [CHAR-LIMIT=None] -->
     <string name="autofill_profile_editor_heading">AutoFill will use your profile to help you complete web forms in a single click.</string>
diff --git a/res/xml/privacy_security_preferences.xml b/res/xml/privacy_security_preferences.xml
index 54f3ff0..9bff4b8 100644
--- a/res/xml/privacy_security_preferences.xml
+++ b/res/xml/privacy_security_preferences.xml
@@ -39,10 +39,9 @@
             android:title="@string/pref_security_show_security_warning"
             android:summary="@string/pref_security_show_security_warning_summary" />
 
-    <CheckBoxPreference
-            android:key="enable_autologin"
-            android:title="@string/pref_autologin_title"
-            android:defaultValue="true" />
+    <ListPreference
+            android:key="autologin_account"
+            android:title="@string/pref_autologin_title" />
 
     <PreferenceCategory android:title="@string/pref_privacy_cookies_title">
         <CheckBoxPreference