diff --git a/browser/base/content/browser-fxaccounts.js b/browser/base/content/browser-fxaccounts.js
index 76d15dbbe4ce..1295e8190451 100644
--- a/browser/base/content/browser-fxaccounts.js
+++ b/browser/base/content/browser-fxaccounts.js
@@ -11,6 +11,7 @@ const PREF_SYNC_START_DOORHANGER = "services.sync.ui.showSyncStartDoorhanger";
 let gFxAccounts = {
 
   _initialized: false,
+  _originalLabel: null,
   _inCustomizationMode: false,
 
   get weave() {
@@ -23,11 +24,10 @@ let gFxAccounts = {
   get topics() {
     delete this.topics;
     return this.topics = [
-      "weave:service:sync:start",
-      "weave:service:login:error",
       FxAccountsCommon.ONLOGIN_NOTIFICATION,
       FxAccountsCommon.ONVERIFIED_NOTIFICATION,
-      FxAccountsCommon.ONLOGOUT_NOTIFICATION
+      FxAccountsCommon.ONLOGOUT_NOTIFICATION,
+      "weave:service:sync:start"
     ];
   },
 
@@ -36,14 +36,6 @@ let gFxAccounts = {
     return this.button = document.getElementById("PanelUI-fxa-status");
   },
 
-  get loginFailed() {
-    if (Weave.Status.login != Weave.LOGIN_SUCCEEDED) {
-      Weave.Service.verifyLogin();
-    }
-    return Weave.Service.identity.readyToAuthenticate &&
-           Weave.Status.login != Weave.LOGIN_SUCCEEDED;
-  },
-
   init: function () {
     if (this._initialized) {
       return;
@@ -56,6 +48,9 @@ let gFxAccounts = {
     gNavToolbox.addEventListener("customizationstarting", this);
     gNavToolbox.addEventListener("customizationending", this);
 
+    // Save the button's original label so that
+    // we can restore it if overridden later.
+    this._originalLabel = this.button.getAttribute("label");
     this._initialized = true;
 
     this.updateUI();
@@ -141,27 +136,17 @@ let gFxAccounts = {
       this.button.removeAttribute("disabled");
     }
 
-    let defaultLabel = this.button.getAttribute("defaultlabel");
-    let errorLabel = this.button.getAttribute("errorlabel");
-
     // If the user is signed into their Firefox account and we are not
     // currently in customization mode, show their email address.
     fxAccounts.getSignedInUser().then(userData => {
-      // Reset the button to its original state.
-      this.button.setAttribute("label", defaultLabel);
-      this.button.removeAttribute("tooltiptext");
-      this.button.removeAttribute("signedin");
-      this.button.removeAttribute("failed");
-
-      if (!this._inCustomizationMode) {
-        if (this.loginFailed) {
-          this.button.setAttribute("failed", "true");
-          this.button.setAttribute("label", errorLabel);
-        } else if (userData) {
-          this.button.setAttribute("signedin", "true");
-          this.button.setAttribute("label", userData.email);
-          this.button.setAttribute("tooltiptext", userData.email);
-        }
+      if (userData && !this._inCustomizationMode) {
+        this.button.setAttribute("signedin", "true");
+        this.button.setAttribute("label", userData.email);
+        this.button.setAttribute("tooltiptext", userData.email);
+      } else {
+        this.button.removeAttribute("signedin");
+        this.button.setAttribute("label", this._originalLabel);
+        this.button.removeAttribute("tooltiptext");
       }
     });
   },
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 290139b684ed..6d6541369237 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -15,9 +15,7 @@
       </vbox>
 
       <footer id="PanelUI-footer">
-        <toolbarbutton id="PanelUI-fxa-status"
-                       defaultlabel="&fxaSignIn.label;"
-                       errorlabel="&fxaSignInError.label;"
+        <toolbarbutton id="PanelUI-fxa-status" label="&fxaSignIn.label;"
                        oncommand="gFxAccounts.toggle(event);"
                        hidden="true"/>
 
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index d71600aa726f..d6593dbb4f0c 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -97,7 +97,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY showAllTabsCmd.accesskey "A">
 
 <!ENTITY fxaSignIn.label "Sign in to &syncBrand.shortName.label;">
-<!ENTITY fxaSignInError.label "Reconnect to &syncBrand.shortName.label;">
 <!ENTITY syncStartPanel.title "&brandShortName; is now syncing.">
 <!ENTITY syncStartPanel.subTitle "You can manage &syncBrand.shortName.label; in Options.">
 <!ENTITY syncStartPanel.subTitleUnix "You can manage &syncBrand.shortName.label; in Preferences.">