diff --git a/LICENSE.md b/LICENSE.md
index 0387e46fc7..5f11d30eca 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -46,4 +46,5 @@ ysl3000 <yannicklamprecht@live.de>
 Nassim Jahnke <nassim@njahnke.dev>
 Machine_Maker <machine@machinemaker.me>
 Ivan Pekov <ivan@mrivanplays.com>
+Camotoy <20743703+Camotoy@users.noreply.github.com>
 ```
diff --git a/Spigot-Server-Patches/Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/Basic-PlayerProfile-API.patch
index 34645a9303..896bc43fb2 100644
--- a/Spigot-Server-Patches/Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/Basic-PlayerProfile-API.patch
@@ -179,9 +179,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        if ((profile.getName() == null || !hasTextures()) && profile.getId() != null) {
 +            GameProfile profile = userCache.getProfile(this.profile.getId());
 +            if (profile != null) {
-+                // if old has it, assume its newer, so overwrite, else use cached if it was set and ours wasn't
-+                copyProfileProperties(this.profile, profile);
-+                this.profile = profile;
++                if (this.profile.getName() == null) {
++                    // if old has it, assume its newer, so overwrite, else use cached if it was set and ours wasn't
++                    copyProfileProperties(this.profile, profile);
++                    this.profile = profile;
++                } else {
++                    copyProfileProperties(profile, this.profile);
++                }
 +            }
 +        }
 +        return this.profile.isComplete();