diff --git a/user.js b/user.js
index d49b87e..013ad97 100644
--- a/user.js
+++ b/user.js
@@ -57,6 +57,11 @@ user_pref("nimbus.validation.enabled", false);
 user_pref("browser.tabs.firefox-view", false);
 user_pref("browser.tabs.firefox-view-next", false);
 
+// Form autofill
+user_pref("extensions.formautofill.addresses.enabled", false);
+user_pref("extensions.formautofill.creditCards.enabled", false);
+user_pref("signon.autofillForms", false);
+
 // Geolocation
 user_pref("geo.enabled", false);
 user_pref("geo.provider.network.url", "https://api.beacondb.net/v1/geolocate");
@@ -327,7 +332,6 @@ user_pref("browser.uitour.enabled", false);
 user_pref("devtools.debugger.remote-enabled", false);
 user_pref("devtools.debugger.skip-pausing", true);
 user_pref("extensions.activeThemeID", "default-theme@mozilla.org");
-user_pref("extensions.formautofill.creditCards.enabled", false);
 user_pref("extensions.getAddons.cache.enabled", false);
 user_pref("extensions.webcompat-reporter.enabled", false);
 user_pref("extensions.webcompat-reporter.newIssueEndpoint", "");
@@ -339,6 +343,5 @@ user_pref("media.videocontrols.picture-in-picture.video-toggle.enabled", false);
 user_pref("network.manage-offline-status", false);
 user_pref("pdfjs.enableScripting", false);
 user_pref("security.family_safety.mode", 0);
-user_pref("signon.autofillForms", false);
 user_pref("toolkit.winRegisterApplicationRestart", false);
 user_pref("trailhead.firstrun.didSeeAboutWelcome", true);
\ No newline at end of file