diff --git a/gitea/gitea.py b/gitea/gitea.py
index ddd31f4..cf07b91 100644
--- a/gitea/gitea.py
+++ b/gitea/gitea.py
@@ -88,16 +88,16 @@ class GiteaApiObject:
                 prop = property(
                     (lambda name: lambda self: self.__get_var(name))(name))
             setattr(cls, name, prop)
-            setattr(api_object, "__"+name, value)
+            setattr(api_object, "_"+name, value)
 
     def __set_var(self,name,i):
         self.dirty_fields.add(name)
-        setattr(self,"__"+name,i)
+        setattr(self,"_"+name,i)
 
     def __get_var(self,name):
         if self.deleted:
             raise ObjectIsInvalid()
-        return getattr(self,"__"+name)
+        return getattr(self,"_"+name)
 
 
 class Organization(GiteaApiObject):
@@ -928,7 +928,9 @@ class Gitea:
         else:
             logging.error(result["message"])
             raise Exception("User not created... (gitea: %s)" % result["message"])
-        return User.parse_request(self, result)
+        user = User.parse_request(self, result)
+        user.update_mail()
+        return user
 
     def create_repo(
         self,
diff --git a/test_api.py b/test_api.py
index 2ef0010..1d578d3 100644
--- a/test_api.py
+++ b/test_api.py
@@ -29,7 +29,9 @@ test_team = "team_" +uuid.uuid4().hex[:8] # team names seem to have a rather low
 test_repo = "repo_" +uuid.uuid4().hex[:8]
 
 def test_token_owner():
-    assert gitea.get_user().username == "test", "Token user not 'test'."
+    user = gitea.get_user()
+    assert user.username == "test", "Token user not 'test'."
+    assert user.is_admin, "Testuser is not Admin - Tests may fail"
 
 def test_gitea_version():
     assert gitea.get_version() == "1.8.2", "Version changed. Updated?"
@@ -49,7 +51,6 @@ def test_fail_get_non_existent_repo():
 def test_create_user():
     email = test_user + "@example.org"
     user = gitea.create_user(test_user, email, "abcdefg123")
-    user.update_mail()
     assert user.username == test_user
     assert user.login == test_user
     assert user.email == email