diff --git a/browser/metro/components/LoginManagerPrompter.js b/browser/metro/components/LoginManagerPrompter.js
index 0437fd1e3059..e7ce537d4aeb 100644
--- a/browser/metro/components/LoginManagerPrompter.js
+++ b/browser/metro/components/LoginManagerPrompter.js
@@ -54,7 +54,7 @@ LoginManagerPrompter.prototype = {
             var bunService = Cc["@mozilla.org/intl/stringbundle;1"].
                              getService(Ci.nsIStringBundleService);
             this.__strBundle = bunService.createBundle(
-                        "chrome://passwordmgr/locale/passwordmgr.properties");
+                        "chrome://browser/locale/passwordmgr.properties");
             if (!this.__strBundle)
                 throw "String bundle for Login Manager not present!";
         }
@@ -337,7 +337,7 @@ LoginManagerPrompter.prototype = {
         var changeButtonAccessKey =
               this._getLocalizedString("notifyBarChangeButtonAccessKey");
         var dontChangeButtonText =
-              this._getLocalizedString("notifyBarDontChangeButtonText");
+              this._getLocalizedString("notifyBarDontChangeButtonText2");
         var dontChangeButtonAccessKey =
               this._getLocalizedString("notifyBarDontChangeButtonAccessKey");
 
diff --git a/browser/metro/components/PromptService.js b/browser/metro/components/PromptService.js
index 66d21c0c196c..f2f7cdcb5c22 100644
--- a/browser/metro/components/PromptService.js
+++ b/browser/metro/components/PromptService.js
@@ -907,7 +907,7 @@ let PromptUtils = {
 };
 
 XPCOMUtils.defineLazyGetter(PromptUtils, "passwdBundle", function () {
-  return Services.strings.createBundle("chrome://passwordmgr/locale/passwordmgr.properties");
+  return Services.strings.createBundle("chrome://browser/locale/passwordmgr.properties");
 });
 
 XPCOMUtils.defineLazyGetter(PromptUtils, "bundle", function () {
diff --git a/browser/metro/locales/en-US/overrides/passwordmgr.properties b/browser/metro/locales/en-US/chrome/passwordmgr.properties
similarity index 58%
rename from browser/metro/locales/en-US/overrides/passwordmgr.properties
rename to browser/metro/locales/en-US/chrome/passwordmgr.properties
index 9a8359f4ca7c..c9238727e7ff 100644
--- a/browser/metro/locales/en-US/overrides/passwordmgr.properties
+++ b/browser/metro/locales/en-US/chrome/passwordmgr.properties
@@ -2,7 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-rememberValue = Use Password Manager to remember this value.
 rememberPassword = Use Password Manager to remember this password.
 savePasswordTitle = Confirm
 # 1st string is product name, 2nd is the username for the login, 3rd is the
@@ -10,29 +9,15 @@ savePasswordTitle = Confirm
 saveLoginText = Do you want %1$S to remember the password for "%2$S" on %3$S?
 # 1st string is product name, 2nd is the login's hostname
 saveLoginTextNoUsername = Do you want %1$S to remember this password on %2$S?
-promptNotNowButtonText = Not Now
-promptNeverForSiteButtonText = Never
-notifyBarNotForThisSiteButtonText = Not for this Site
+notifyBarNotForThisSiteButtonText = Not for this site
 notifyBarNotForThisSiteButtonAccessKey =
-promptRememberButtonText = Remember
-notifyBarRememberPasswordButtonText = Remember Password
+notifyBarRememberPasswordButtonText = Remember password
 notifyBarRememberPasswordButtonAccessKey =
 passwordChangeTitle = Confirm Password Change
 passwordChangeText = Would you like to change the stored password for %S?
 passwordChangeTextNoUser = Would you like to change the stored password for this login?
 notifyBarChangeButtonText = Change
 notifyBarChangeButtonAccessKey =
-notifyBarDontChangeButtonText = Don't Change
+notifyBarDontChangeButtonText2 = Don't change
 notifyBarDontChangeButtonAccessKey =
 userSelectText = Please confirm which user you are changing the password for
-hidePasswords=Hide Passwords
-hidePasswordsAccessKey=P
-showPasswords=Show Passwords
-showPasswordsAccessKey=P
-noMasterPasswordPrompt=Are you sure you wish to show your passwords?
-removeAllPasswordsPrompt=Are you sure you wish to remove all passwords?
-removeAllPasswordsTitle=Remove all passwords
-loginsSpielAll=Passwords for the following sites are stored on your computer:
-loginsSpielFiltered=The following passwords match your search:
-username=Username
-password=Password
diff --git a/browser/metro/locales/jar.mn b/browser/metro/locales/jar.mn
index 5fc871c89e31..29e886f390fd 100644
--- a/browser/metro/locales/jar.mn
+++ b/browser/metro/locales/jar.mn
@@ -17,14 +17,13 @@
   locale/browser/checkbox.dtd             (%chrome/checkbox.dtd)
   locale/browser/sync.dtd                 (%chrome/sync.dtd)
   locale/browser/sync.properties          (%chrome/sync.properties)
+  locale/browser/passwordmgr.properties   (%chrome/passwordmgr.properties)
   locale/browser/prompt.dtd               (%chrome/prompt.dtd)
   locale/browser/phishing.dtd             (%chrome/phishing.dtd)
 
 @AB_CD@.jar:
 % locale browser @AB_CD@ %locale/browser/
   locale/browser/bookmarks.json           (bookmarks.json)
-  locale/browser/passwordmgr.properties   (%overrides/passwordmgr.properties)
-% override chrome://passwordmgr/locale/passwordmgr.properties chrome://browser/locale/passwordmgr.properties
 
 #
 # Browser jar resources