diff --git a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/chat/ChatModule.java b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/chat/ChatModule.java
index 7a2a6b8cc..8d17a1905 100644
--- a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/chat/ChatModule.java
+++ b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/chat/ChatModule.java
@@ -4,6 +4,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 
 import mineplex.core.MiniPlugin;
 import mineplex.core.ReflectivelyCreateMiniPlugin;
@@ -11,6 +13,7 @@ import mineplex.core.account.CoreClientManager;
 import mineplex.core.chat.Chat;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
 
 /**
  * This module handles player chat.
@@ -30,6 +33,18 @@ public class ChatModule extends MiniPlugin
 		_chat = require(Chat.class);
 	}
 
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void playerJoin(PlayerJoinEvent event)
+	{
+		event.setJoinMessage(F.sys("Join", event.getPlayer().getName()));
+	}
+	
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void playerQuit(PlayerQuitEvent event)
+	{
+		event.setQuitMessage(F.sys("Quit", event.getPlayer().getName()));
+	}
+	
 	@EventHandler(priority = EventPriority.HIGHEST)
 	public void chat(AsyncPlayerChatEvent event)
 	{