diff --git a/common/src/main/java/me/lucko/luckperms/common/model/manager/user/AbstractUserManager.java b/common/src/main/java/me/lucko/luckperms/common/model/manager/user/AbstractUserManager.java
index 1312cd2b3..4870f4cc7 100644
--- a/common/src/main/java/me/lucko/luckperms/common/model/manager/user/AbstractUserManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/model/manager/user/AbstractUserManager.java
@@ -59,7 +59,9 @@ public abstract class AbstractUserManager<T extends User> extends AbstractManage
     @Override
     public T getOrMake(UUID id, String username) {
         T user = getOrMake(id);
-        user.setUsername(username, false);
+        if (username != null) {
+            user.setUsername(username, false);
+        }
         return user;
     }