diff --git a/browser/metro/base/content/contenthandlers/Content.js b/browser/metro/base/content/contenthandlers/Content.js
index cc5051c050ff..0f39bee82b3e 100644
--- a/browser/metro/base/content/contenthandlers/Content.js
+++ b/browser/metro/base/content/contenthandlers/Content.js
@@ -140,7 +140,6 @@ let Content = {
     addEventListener("MozApplicationManifest", this, false);
     addEventListener("DOMContentLoaded", this, false);
     addEventListener("DOMAutoComplete", this, false);
-    addEventListener("DOMFormHasPassword", this, false);
     addEventListener("blur", this, false);
     addEventListener("pagehide", this, false);
     // Attach a listener to watch for "click" events bubbling up from error
@@ -190,10 +189,6 @@ let Content = {
           this._onClickCapture(aEvent);
         break;
 
-      case "DOMFormHasPassword":
-        LoginManagerContent.onFormPassword(aEvent);
-        break;
-
       case "DOMContentLoaded":
         LoginManagerContent.onContentLoaded(aEvent);
         this._maybeNotifyErrorPage();
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 6c034bc7d7b7..1dba085b70bb 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -2670,7 +2670,6 @@ Tab.prototype = {
     this.browser.sessionHistory.addSHistoryListener(this);
 
     this.browser.addEventListener("DOMContentLoaded", this, true);
-    this.browser.addEventListener("DOMFormHasPassword", this, true);
     this.browser.addEventListener("DOMLinkAdded", this, true);
     this.browser.addEventListener("DOMTitleChanged", this, true);
     this.browser.addEventListener("DOMWindowClose", this, true);
@@ -2819,7 +2818,6 @@ Tab.prototype = {
     this.browser.sessionHistory.removeSHistoryListener(this);
 
     this.browser.removeEventListener("DOMContentLoaded", this, true);
-    this.browser.removeEventListener("DOMFormHasPassword", this, true);
     this.browser.removeEventListener("DOMLinkAdded", this, true);
     this.browser.removeEventListener("DOMTitleChanged", this, true);
     this.browser.removeEventListener("DOMWindowClose", this, true);
@@ -3377,11 +3375,6 @@ Tab.prototype = {
         break;
       }
 
-      case "DOMFormHasPassword": {
-        LoginManagerContent.onFormPassword(aEvent);
-        break;
-      }
-
       case "DOMLinkAdded": {
         let target = aEvent.originalTarget;
         if (!target.href || target.disabled)