diff --git a/src/authdb.cpp b/src/authdb.cpp
index d8a0ced5b0bd3a2e558a22e43c5172b2b16938e7..2d30c7a699701bc0587c5c550001e6efbbeccc31 100644
--- a/src/authdb.cpp
+++ b/src/authdb.cpp
@@ -474,12 +474,12 @@ VALUEFOUND:
 
                 uuid_t adminid,admingid;
 
-                class authdb::UserData udat(adminid);
-
                 uuid_generate(adminid);
 
                 uuid_generate(admingid);
 
+                class authdb::UserData udat(adminid);
+
                 udat.setUserName(username.c_str());
 
                 authdb::sha512 sha;
diff --git a/src/user.cpp b/src/user.cpp
index 331b6540d6a53c705d298e0f889725bc25e95d38..43f0baa0cf1e4effca7e1e5f6a5884ffebffa67b 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -154,6 +154,9 @@ void authdb::UserData::setAvatar(const std::vector<char>& src){
 
    AuthData *curec=this;
 
+   uuid_t gid;
+   uuid_copy(gid,Data->uuid);
+
    if(!target){
         while(curec){
             if(curec->Data->type == authdb::UserData &&
@@ -180,6 +183,8 @@ void authdb::UserData::setAvatar(const std::vector<char>& src){
     target->type=DataType::UserData;
     target->storage=StorageType::BinaryStorage;
 
+    uuid_copy(target->uuid,gid);
+
     snprintf(target->fieldname,255,"%s","avatar");
     target->datasize=src.size();
     target->data= new char[target->datasize];