0
@@ -611,7 +611,7 @@ class DatastoreFileStub(object):
0
             value_pb.mutable_uservalue().set_gaiaid(minint)
0
             value_pb.mutable_uservalue().set_email('')
0
             value_pb.mutable_uservalue().set_auth_domain('')
0
-            value_pb.mutable_uservalue().clear_nickname()
0
+            value_pb.mutable_uservalue().set_nickname('')
0
           elif value_pb.has_referencevalue():
0
             value_pb.clear_referencevalue()
0
             value_pb.mutable_referencevalue().set_app('')

0
@@ -974,6 +974,7 @@ def ToPropertyPb(name, values):
0
       pbvalue.mutable_pointvalue().set_y(v.lon)
0
     elif isinstance(v, users.User):
0
       pbvalue.mutable_uservalue().set_email(v.email().encode('utf-8'))
0
+      pbvalue.mutable_uservalue().set_nickname(v.nickname().encode('utf-8'))
0
       pbvalue.mutable_uservalue().set_auth_domain(
0
         v.auth_domain().encode('utf-8'))
0
       pbvalue.mutable_uservalue().set_gaiaid(0)
0
@@ -1067,7 +1068,8 @@ def FromPropertyPb(pb):
0
   elif pbval.has_uservalue():
0
     email = unicode(pbval.uservalue().email().decode('utf-8'))
0
     auth_domain = unicode(pbval.uservalue().auth_domain().decode('utf-8'))
0
-    value = users.User(email=email, _auth_domain=auth_domain)
0
+    nickname = unicode(pbval.uservalue().nickname().decode('utf-8'))
0
+    value = users.User(email=email, _auth_domain=auth_domain, nickname=nickname)
0
   elif pbval.has_referencevalue():
0
     value = FromReferenceProperty(pbval)
0
   elif pbval.has_int64value():