diff -r 9b07ddeb1412 -r 94834a1e6c01 app/soc/models/user.py
--- a/app/soc/models/user.py	Fri Nov 14 06:36:42 2008 +0000
+++ b/app/soc/models/user.py	Sat Nov 15 03:12:33 2008 +0000
@@ -65,14 +65,14 @@
   #: This email address is only used in an automated fashion by 
   #: Melange web applications and is not made visible to other users 
   #: of any Melange application.
-  id = db.UserProperty(required=True,
+  account = db.UserProperty(required=True,
       verbose_name=ugettext_lazy('User account'))
-  id.help_text = ugettext_lazy(
-      'Email address of a valid user (Google Account).')
+  account.help_text = ugettext_lazy(
+      'A valid Google Account.')
 
   #: A list (possibly empty) of former Google Accounts associated with
   #: this User.
-  former_ids = db.ListProperty(users.User)
+  former_accounts = db.ListProperty(users.User)
 
   #: Required field storing a nickname; displayed publicly.
   #: Nicknames can be any valid UTF-8 text.