From 0dddebadf2a0b18c9559a15eb85a877bce7af4da Mon Sep 17 00:00:00 2001
From: "morse%netscape.com" <morse%netscape.com>
Date: Wed, 2 Feb 2000 01:34:54 +0000
Subject: [PATCH] cancelling out of change-password was resulting in being
 asked for database key twice, r=pnunn

---
 extensions/wallet/src/wallet.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/wallet/src/wallet.cpp b/extensions/wallet/src/wallet.cpp
index a420cca153d5..b79c501221c4 100644
--- a/extensions/wallet/src/wallet.cpp
+++ b/extensions/wallet/src/wallet.cpp
@@ -2665,12 +2665,12 @@ void WLLT_ChangePassword() {
 
   /* read in user data using old key */
   wallet_Initialize(PR_TRUE);
-#ifdef SingleSignon
-  SI_LoadSignonData(PR_TRUE);
-#endif
   if (!Wallet_KeySet()) {
     return;
   }
+#ifdef SingleSignon
+  SI_LoadSignonData(PR_TRUE);
+#endif
 
   /* establish new key */
   Wallet_SetKey(PR_TRUE);