diff --git a/patches/server/Basic-PlayerProfile-API.patch b/patches/server/Basic-PlayerProfile-API.patch
index 4ba854c14b..8b296adecc 100644
--- a/patches/server/Basic-PlayerProfile-API.patch
+++ b/patches/server/Basic-PlayerProfile-API.patch
@@ -250,6 +250,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                // 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;
++                this.emptyUUID = false; // UUID was just retrieved from user cache and profile isn't null (so a completed profile was found)
 +            }
 +        }
 +
@@ -261,6 +262,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    // 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;
++                    this.emptyName = false; // Name was just retrieved via the userCache
 +                } else if (profile != this.profile) {
 +                    copyProfileProperties(profile, this.profile);
 +                }
@@ -281,7 +283,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        MinecraftServer server = MinecraftServer.getServer();
 +        boolean isCompleteFromCache = this.completeFromCache(true, onlineMode);
 +        if (onlineMode && (!isCompleteFromCache || (textures && !hasTextures()))) {
-+            ProfileResult result = server.getSessionService().fetchProfile(this.getId(), true);
++            ProfileResult result = server.getSessionService().fetchProfile(this.profile.getId(), true);
 +            if (result != null && result.profile() != null) {
 +                copyProfileProperties(result.profile(), this.profile, true);
 +            }