diff --git a/VpSharp/src/VirtualParadiseClient.Avatars.cs b/VpSharp/src/VirtualParadiseClient.Avatars.cs
index 8853347..d5c3fdd 100644
--- a/VpSharp/src/VirtualParadiseClient.Avatars.cs
+++ b/VpSharp/src/VirtualParadiseClient.Avatars.cs
@@ -36,6 +36,7 @@ public sealed partial class VirtualParadiseClient
             existing.Location = avatar.Location;
             existing.Application = avatar.Application;
             existing.Type = avatar.Type;
+            existing.User = avatar.User;
             return existing;
         });
     }
diff --git a/VpSharp/src/VirtualParadiseClient.NativeEvents.cs b/VpSharp/src/VirtualParadiseClient.NativeEvents.cs
index a429aba..f76f624 100644
--- a/VpSharp/src/VirtualParadiseClient.NativeEvents.cs
+++ b/VpSharp/src/VirtualParadiseClient.NativeEvents.cs
@@ -89,8 +89,8 @@ public sealed partial class VirtualParadiseClient
     private async void OnAvatarAddNativeEvent(nint sender)
     {
         VirtualParadiseAvatar avatar = ExtractAvatar(sender);
-        avatar = AddOrUpdateAvatar(avatar);
         avatar.User = await GetUserAsync(vp_int(sender, IntegerAttribute.UserId)).ConfigureAwait(false);
+        avatar = AddOrUpdateAvatar(avatar);
         _avatarJoined.OnNext(avatar);
     }