diff --git a/init.lua b/init.lua
index 8056045..081a6e5 100644
--- a/init.lua
+++ b/init.lua
@@ -188,7 +188,7 @@ function mana.save_to_file()
 end
 
 
-minetest.register_on_dieplayer(function(player)
+minetest.register_on_respawnplayer(function(player)
 	local playername = player:get_player_name()
 	mana.set(playername, 0)
 	mana.hud_update(playername)
@@ -237,7 +237,9 @@ minetest.register_globalstep(function(dtime)
 		for i=1, #players do
 			local name = players[i]:get_player_name()
 			if mana.playerlist[name] ~= nil then
-				mana.add_up_to(name, mana.playerlist[name].regen)
+				if players[i]:get_hp() > 0 then
+					mana.add_up_to(name, mana.playerlist[name].regen)
+				end
 			end
 		end
 		mana.regen_timer = 0