diff --git a/mozilla/grendel/prefs/Prefs.java b/mozilla/grendel/prefs/Prefs.java
index c6888079902..6abd8794377 100644
--- a/mozilla/grendel/prefs/Prefs.java
+++ b/mozilla/grendel/prefs/Prefs.java
@@ -36,12 +36,12 @@ import grendel.ui.StoreFactory;
 public class Prefs {
   static Preferences   fPrefs = PreferencesFactory.Get();
 
-  static final String kUserName = "user.name";
-  static final String kOrganization = "user.organization";
-  static final String kEmailAddress = "user.email_address";
-  static final String kPopHost = "pop.host";
-  static final String kPopUser = "pop.user";
-  static final String kPopPassword = "pop.password";
+  static final String kUserName = "user.identity-0.username";
+  static final String kOrganization = "user.identity-0.organization";
+  static final String kEmailAddress = "user.identity-0.email";
+  //static final String kPopHost = "pop.host";
+  //static final String kPopUser = "pop.user";
+  //static final String kPopPassword = "pop.password";
   static final String kPopLeaveOnServer = "pop.leaveMailOnServer";
   static final String kMailDirectory = "mail.directory";
   static final String kSMTPHost = "mail.smtp.host";