diff --git a/mods/chatplus/api.lua b/mods/chatplus/api.lua
index 723f434..f141fc0 100644
--- a/mods/chatplus/api.lua
+++ b/mods/chatplus/api.lua
@@ -177,6 +177,14 @@ function chatplus.log_message(from, msg)
 	chatplus.log("<" .. from .. "> " .. msg)
 end
 
+minetest.register_on_joinplayer(function(player)
+	chatplus.poke(player:get_player_name(), player)
+end)
+
+minetest.register_on_leaveplayer(function(player)
+	chatplus.poke(player:get_player_name(), "end")
+end)
+
 function chatplus.send(from, msg)
 	if msg:sub(1, 1) == "/" then
 		return false