diff --git a/common/src/main/java/me/lucko/luckperms/common/managers/impl/GenericUserManager.java b/common/src/main/java/me/lucko/luckperms/common/managers/impl/GenericUserManager.java
index bf91abff2..2197b2b74 100644
--- a/common/src/main/java/me/lucko/luckperms/common/managers/impl/GenericUserManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/managers/impl/GenericUserManager.java
@@ -71,6 +71,15 @@ public class GenericUserManager extends AbstractManager<UserIdentifier, User> im
         return true;
     }
 
+    @Override
+    public User getOrMake(UserIdentifier id) {
+        User ret = super.getOrMake(id);
+        if (id.getUsername().isPresent()) {
+            ret.setName(id.getUsername().get(), false);
+        }
+        return ret;
+    }
+
     /**
      * Check whether the user's state indicates that they should be persisted to storage.
      *
diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java b/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java
index 0b892ea44..9d68f96ab 100644
--- a/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java
+++ b/sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java
@@ -134,7 +134,11 @@ public class SpongeUserManager implements UserManager, LPSubjectCollection {
 
     @Override
     public SpongeUser getOrMake(UserIdentifier id) {
-        return objects.get(id);
+        SpongeUser ret = objects.get(id);
+        if (id.getUsername().isPresent()) {
+            ret.setName(id.getUsername().get(), false);
+        }
+        return ret;
     }
 
     @Override