diff --git a/browser/components/preferences/in-content/security.xul b/browser/components/preferences/in-content/security.xul
index a10576c25d..b7bdb93613 100644
--- a/browser/components/preferences/in-content/security.xul
+++ b/browser/components/preferences/in-content/security.xul
@@ -45,6 +45,7 @@
 
   <!-- Passwords -->
   <preference id="signon.rememberSignons" name="signon.rememberSignons" type="bool"/>
+  <preference id="signon.autofillForms"   name="signon.autofillForms"   type="bool"/>
 
 </preferences>
 
@@ -103,6 +104,9 @@
             accesskey="&passwordExceptions.accesskey;"
             preference="pref.privacy.disable_button.view_passwords_exceptions"/>
   </hbox>
+  <checkbox id="autofillPasswords" flex="1"
+         label="&autofillPasswords.label;" accesskey="&autofillPasswords.accesskey;"
+         preference="signon.autofillForms"/>
   <grid id="passwordGrid">
     <columns>
       <column flex="1"/>
diff --git a/browser/locales/en-US/chrome/browser/preferences/security.dtd b/browser/locales/en-US/chrome/browser/preferences/security.dtd
index ca9420401e..7ccc9af50a 100644
--- a/browser/locales/en-US/chrome/browser/preferences/security.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/security.dtd
@@ -31,6 +31,9 @@
 <!ENTITY  passwordExceptions.label      "Exceptions…">
 <!ENTITY  passwordExceptions.accesskey  "x">
 
+<!ENTITY  autofillPasswords.label       "Automatically fill in log-in details">
+<!ENTITY  autofillPasswords.accesskey   "A">
+
 <!ENTITY  useMasterPassword.label        "Use a master password">
 <!ENTITY  useMasterPassword.accesskey    "U">
 <!ENTITY  changeMasterPassword.label     "Change Master Password…">
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index da610f47de..0091aab9b5 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4351,7 +4351,7 @@ pref("font.name.monospace.x-unicode", "dt-interface user-ucs2.cjk_japan-0");
 // Login Manager prefs
 pref("signon.rememberSignons",              true);
 pref("signon.rememberSignons.visibilityToggle", true);
-pref("signon.autofillForms",                true);
+pref("signon.autofillForms",                false);
 pref("signon.autofillForms.http",           false);
 pref("signon.autologin.proxy",              false);
 pref("signon.formlessCapture.enabled",      true);