diff --git a/src/main/kotlin/dev/solsynth/snConnect/listeners/SnChatListener.kt b/src/main/kotlin/dev/solsynth/snConnect/listeners/SnChatListener.kt
index b2e04f0..84841cd 100644
--- a/src/main/kotlin/dev/solsynth/snConnect/listeners/SnChatListener.kt
+++ b/src/main/kotlin/dev/solsynth/snConnect/listeners/SnChatListener.kt
@@ -27,9 +27,8 @@ class SnChatListener(
     @Suppress("SENSELESS_COMPARISON")
     @EventHandler()
     fun onPlayerJoin(event: PlayerJoinEvent) {
-        val user = CMI.getInstance().playerManager.getUser(event.player);
-        val firstTime = user.playerTime == 0L;
-        val templateKey = if (!firstTime) "join" else "joinFirst";
+        val firstTime = Bukkit.getOfflinePlayer(event.player.uniqueId) == null;
+        val templateKey = if (!firstTime) "join" else "join_first";
         val template = messages[templateKey]
             ?: if (!firstTime) "➡️ {player} joined the game." else "➡️ {player} first time joined the game."
         val message = template.replace("{player}", event.player.name)
diff --git a/src/main/resources/messages.yml b/src/main/resources/messages.yml
index 0036609..cff5ace 100644
--- a/src/main/resources/messages.yml
+++ b/src/main/resources/messages.yml
@@ -1,5 +1,5 @@
 join: "➡️ {player} joined the game."
-joinFirst: "➡️ {player} first time joined the game."
+join_first: "➡️ {player} first time joined the game."
 quit: "⬅️ {player} left the game."
 death: "💀 {player} {message}"
 advancement: "🎉 {player} unlocked advancement: {advancement}"
diff --git a/src/main/resources/messages_zh.yml b/src/main/resources/messages_zh.yml
index 6593062..078263e 100644
--- a/src/main/resources/messages_zh.yml
+++ b/src/main/resources/messages_zh.yml
@@ -1,5 +1,5 @@
 join: "➡️ {player} 加入了游戏。"
-joinFirst: "➡️ {player} 首次加入了游戏。"
+join_first: "➡️ {player} 首次加入了游戏。"
 quit: "⬅️ {player} 离开了游戏。"
 death: "💀 {player} {message}"
 advancement: "🎉 {player} 解锁成就：{advancement}"