--- a/app/soc/logic/models/user.py	Tue Nov 18 21:17:53 2008 +0000
+++ b/app/soc/logic/models/user.py	Wed Nov 19 08:39:29 2008 +0000
@@ -54,7 +54,7 @@
     """See base.Logic.getKeyValues.
     """
 
-    return [entity.account.email()]
+    return [entity.link_name]
 
   def getSuffixValues(self, entity):
     """See base.Logic.getSuffixValues.
@@ -66,15 +66,7 @@
     """See base.Logic.getKeyValuesFromFields.
     """
 
-    if 'email' in fields:
-      return [fields['email']]
-
-    properties = {
-        'link_name': fields['link_name']
-        }
-
-    entity = self.getForFields(properties, unique=True)
-    return [entity.link_name]
+    return [fields['link_name']]
 
   def getKeyFieldNames(self):
     """See base.Logic.getKeyFieldNames.