diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeListener.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeListener.java
index d3b007fe..8b183bf3 100644
--- a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeListener.java
+++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeListener.java
@@ -108,8 +108,8 @@ public class BungeeListener extends AbstractListener implements Listener {
                     plugin.getStorage().force().saveUUIDData(c.getName(), c.getUniqueId()).join();
                 }
             } else {
-                UUID uuid = plugin.getStorage().getUUID(c.getName()).join();
-                if (uuid == null) {
+                String name = plugin.getStorage().getName(c.getUniqueId()).join();
+                if (name == null) {
                     plugin.getApiProvider().fireEventAsync(new UserFirstLoginEvent(c.getUniqueId(), c.getName()));
                 }
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/AbstractListener.java b/common/src/main/java/me/lucko/luckperms/common/utils/AbstractListener.java
index 1cd07ff5..bf81ab62 100644
--- a/common/src/main/java/me/lucko/luckperms/common/utils/AbstractListener.java
+++ b/common/src/main/java/me/lucko/luckperms/common/utils/AbstractListener.java
@@ -54,8 +54,8 @@ public class AbstractListener {
                 plugin.getStorage().force().saveUUIDData(username, u);
             }
         } else {
-            UUID uuid = plugin.getStorage().force().getUUID(username).join();
-            if (uuid == null) {
+            String name = plugin.getStorage().force().getName(u).join();
+            if (name == null) {
                 plugin.getApiProvider().fireEventAsync(new UserFirstLoginEvent(u, username));
             }