diff --git a/extensions/wallet/src/wallet.cpp b/extensions/wallet/src/wallet.cpp
index fb69b126c304..77c1c0c0f980 100644
--- a/extensions/wallet/src/wallet.cpp
+++ b/extensions/wallet/src/wallet.cpp
@@ -735,7 +735,9 @@ Wallet_SetKey(PRBool isNewkey) {
 
   /* ask the user for his key */
   char * password;
-  if (isNewkey) {
+  if (wallet_KeySize() < 0) { /* no password has yet been established */
+    password = Wallet_Localize("firstPassword");
+  } else if (isNewkey) {
     password = Wallet_Localize("newPassword");
   } else {
     password = Wallet_Localize("password");
diff --git a/extensions/wallet/src/wallet.properties b/extensions/wallet/src/wallet.properties
index 553ea0289e45..4c882cb46a2f 100644
--- a/extensions/wallet/src/wallet.properties
+++ b/extensions/wallet/src/wallet.properties
@@ -17,8 +17,9 @@ KeyFailure = Key failure!  Wallet file will not be opened.
 WantToCaptureForm? = Do you want to put the values on this form into your wallet?
 WantToSavePassword? = Do you want to save the user name and password for this form?
 FollowingItemsCanBePrefilledForYou = Following items can be pre-filled for you.
-password = database password: 
-newPassword = new password: 
+firstPassword = select a password for your database (press cancel if you don't want to use a password)
+password = enter your database password 
+newPassword = enter a new password for your database (press cancel if you don't want to use a password) 
 SelectUser = Select a username to be entered on this form
 SelectUserWhosePasswordIsBeingChanged = Select the user whose password is being changed.
 PasswordNotification1 = For your convenience, the browser can remember your user names and passwords so you won't have to re-type them when you return to a site.