diff --git a/build-number.txt b/build-number.txt
index 22028e1f..1f5e025c 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-1289
\ No newline at end of file
+1295
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/data/PlayerEntry.java b/src/main/java/me/chayapak1/chomens_bot/data/PlayerEntry.java
index 962411ae..3726ae27 100644
--- a/src/main/java/me/chayapak1/chomens_bot/data/PlayerEntry.java
+++ b/src/main/java/me/chayapak1/chomens_bot/data/PlayerEntry.java
@@ -1,17 +1,20 @@
 package me.chayapak1.chomens_bot.data;
 
+import net.kyori.adventure.text.Component;
 import org.geysermc.mcprotocollib.auth.GameProfile;
 import org.geysermc.mcprotocollib.protocol.data.game.PlayerListEntry;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
-import net.kyori.adventure.text.Component;
 
 import java.security.PublicKey;
+import java.util.ArrayList;
+import java.util.List;
 
 public class PlayerEntry {
     public final GameProfile profile;
     public GameMode gamemode;
     public int latency;
     public Component displayName;
+    public List<String> usernames = new ArrayList<>();
     public final long expiresAt;
     public PublicKey publicKey;
     public final byte[] keySignature;
@@ -35,6 +38,8 @@ public class PlayerEntry {
         this.publicKey = publicKey;
         this.keySignature = keySignature;
         this.listed = listed;
+
+        this.usernames.add(this.profile.getName());
     }
 
     public PlayerEntry (PlayerListEntry entry) {
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java
index 6d36e950..6973a6e9 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java
@@ -101,7 +101,7 @@ public class PlayersPlugin extends Bot.Listener {
 
     public final PlayerEntry getEntry (String username) {
         for (PlayerEntry candidate : list) {
-            if (getName(candidate).equals(username)) {
+            if (getName(candidate).equals(username) || candidate.usernames.contains(username)) {
                 return candidate;
             }
         }
@@ -145,16 +145,32 @@ public class PlayersPlugin extends Bot.Listener {
 
     private void addPlayer (PlayerListEntry newEntry) {
         final PlayerEntry duplicate = getEntry(newEntry);
-        if (duplicate != null) list.remove(duplicate);
+
+        boolean isUsernameChange = false;
+        boolean isUnVanish = false;
 
         final PlayerEntry target = new PlayerEntry(newEntry);
 
+        if (duplicate != null) {
+            if (!duplicate.profile.getName().equals(target.profile.getName())) {
+                isUsernameChange = true;
+
+                target.usernames = duplicate.usernames;
+
+                target.usernames.add(target.profile.getName());
+            } else {
+                isUnVanish = true;
+            }
+        }
+
         list.add(target);
 
-        if (duplicate == null) {
+        if (!isUsernameChange && !isUnVanish) {
             for (Listener listener : listeners) { listener.playerJoined(target); }
-        } else {
+        } else if (isUnVanish) {
             for (Listener listener : listeners) { listener.playerUnVanished(target); }
+        } else {
+            for (Listener listener : listeners) { listener.playerChangedUsername(target); }
         }
     }
 
@@ -230,5 +246,6 @@ public class PlayersPlugin extends Bot.Listener {
         public void playerDisplayNameUpdated (PlayerEntry target, Component displayName) {}
         public void playerLeft (PlayerEntry target) {}
         public void playerVanished (PlayerEntry target) {}
+        public void playerChangedUsername (PlayerEntry target) {}
     }
 }