diff --git a/suite/browser/browser-prefs.js b/suite/browser/browser-prefs.js
index d2959aaa9d..de7f2f1fbd 100644
--- a/suite/browser/browser-prefs.js
+++ b/suite/browser/browser-prefs.js
@@ -254,20 +254,7 @@ pref("offline.startup_state",            0);
 pref("offline.send.unsent_messages",            0);
 pref("offline.download.download_messages",  0);
 
-pref("signon.rememberSignons",              true);
-pref("signon.expireMasterPassword",         false);
-
 pref("browser.formfill.enable",             true);
-pref("wallet.captureForms",                 false);
-pref("wallet.enabled",                      true);
-pref("wallet.crypto",                       false);
-pref("wallet.crypto.autocompleteoverride",  false); // Ignore 'autocomplete=off' - available only when wallet.crypto is enabled. 
-pref("wallet.namePanel.hide",               false);
-pref("wallet.addressPanel.hide",            false);
-pref("wallet.phonePanel.hide",              false);
-pref("wallet.creditPanel.hide",             false);
-pref("wallet.employPanel.hide",             false);
-pref("wallet.miscPanel.hide",               false);
 
 // -- folders (Mac: these are binary aliases.)
 pref("mail.signature_file",             "");
diff --git a/suite/common/tasksOverlay.js b/suite/common/tasksOverlay.js
index 9e34603a91..f4e8f568e9 100644
--- a/suite/common/tasksOverlay.js
+++ b/suite/common/tasksOverlay.js
@@ -46,6 +46,25 @@ function toNavigator()
     OpenBrowserWindow();
 }
 
+function toPasswordManager()
+{
+  toOpenWindowByType("Password:Manager",
+                     "chrome://communicator/content/passwordManager.xul");
+}
+
+function ExpirePassword()
+{
+  // Queries the HTTP Auth Manager and clears all sessions
+  Components.classes['@mozilla.org/network/http-auth-manager;1']
+            .getService(Components.interfaces.nsIHttpAuthManager)
+            .clearAll();
+
+  // Expires the master password
+  Components.classes["@mozilla.org/security/sdr;1"]
+            .getService(Components.interfaces.nsISecretDecoderRing)
+            .logoutAndTeardown();
+}
+
 function toDownloadManager()
 {
   var dlmgr = Components.classes['@mozilla.org/download-manager;1'].getService();
diff --git a/suite/common/tasksOverlay.xul b/suite/common/tasksOverlay.xul
index 02172e2843..4fd4171db2 100644
--- a/suite/common/tasksOverlay.xul
+++ b/suite/common/tasksOverlay.xul
@@ -25,6 +25,18 @@
       <!-- Tasks Menu -->
       <menu id="tasksMenu" label="&tasksMenu.label;" accesskey="&tasksMenu.accesskey;">
         <menupopup id="taskPopup">
+          <menu id="menu_passwordManager"
+                label="&passwordManagerCmd.label;"
+                accesskey="&passwordManagerCmd.accesskey;">
+            <menupopup>
+              <menuitem label="&passwordDisplayCmd.label;"
+                        accesskey="&passwordDisplayCmd.accesskey;"
+                        oncommand="toPasswordManager();"/>
+              <menuitem label="&passwordExpireCmd.label;"
+                        accesskey="&passwordExpireCmd.accesskey;"
+                        oncommand="ExpirePassword();"/>
+            </menupopup>
+          </menu>
           <menuitem id="downloadmgr" label="&downloadManagerCmd.label;" accesskey="&downloadManagerCmd.accesskey;" oncommand="toDownloadManager();"/>
           <menuitem id="addonsmgr" accesskey="&addonsManagerCmd.accesskey;"
                     label="&addonsManagerCmd.label;" oncommand="toEM();"/>
diff --git a/suite/locales/en-US/chrome/common/tasksOverlay.dtd b/suite/locales/en-US/chrome/common/tasksOverlay.dtd
index b2288fea64..39eca1fe94 100644
--- a/suite/locales/en-US/chrome/common/tasksOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/tasksOverlay.dtd
@@ -25,6 +25,15 @@
 <!ENTITY tasksMenu.label "Tools">
 <!ENTITY tasksMenu.accesskey "T"> 
 
+<!ENTITY passwordManagerCmd.label "Password Manager">
+<!ENTITY passwordManagerCmd.accesskey "P">
+
+<!ENTITY passwordDisplayCmd.label "Manage Stored Passwords">
+<!ENTITY passwordDisplayCmd.accesskey "M">
+
+<!ENTITY passwordExpireCmd.label "Log Out">
+<!ENTITY passwordExpireCmd.accesskey "l">
+
 <!ENTITY downloadManagerCmd.label "Download Manager">
 <!ENTITY downloadManagerCmd.accesskey "D">