diff -r 87afae6e4c51 -r 875bdc5741eb app/soc/logic/models/user.py
--- a/app/soc/logic/models/user.py	Sun Nov 16 23:04:48 2008 +0000
+++ b/app/soc/logic/models/user.py	Mon Nov 17 00:01:33 2008 +0000
@@ -74,7 +74,7 @@
         }
 
     entity = self.getForFields(properties, unique=True)
-    return [entity.account.email()]
+    return [entity.link_name]
 
   def getKeyFieldNames(self):
     """See base.Logic.getKeyFieldNames
@@ -92,7 +92,8 @@
     if user:
       key_name = user.key().name()
     else:
-      key_name  = self.getKeyNameForFields({'email': account.email()})
+      raise
+      key_name  = self.getKeyNameForFields({'link_name': properties['link_name']})
 
     return self.updateOrCreateFromKeyName(properties, key_name)