diff --git a/data/creaturescripts/scripts/firstitems.lua b/data/creaturescripts/scripts/firstitems.lua
index 0c3c75a..7c837c9 100644
--- a/data/creaturescripts/scripts/firstitems.lua
+++ b/data/creaturescripts/scripts/firstitems.lua
@@ -1,5 +1,7 @@
 function onLogin(player)
-	if player:getLastLoginSaved() <= 0 then
+	if player:getLastLoginSaved() <= 0 or player:getStorageValue(30017) == 1 then
+		player:setStorageValue(30017, 0) -- reset storage for first items
+		
 		-- Items
 		if player:getSex() == PLAYERSEX_FEMALE then
 			player:addItem(3562, 1, true, -1, CONST_SLOT_ARMOR)
diff --git a/src/player.cpp b/src/player.cpp
index db34103..4cca9d8 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1732,8 +1732,7 @@ void Player::death(Creature* lastHitCreature)
 					loginPosition = getTemplePosition();
 
 					// Restart first items
-					lastLoginSaved = 0;
-					lastLogout = 0;
+					addStorageValue(30017, 1);
 
 					// Restart items
 					for (int32_t slot = CONST_SLOT_FIRST; slot <= CONST_SLOT_LAST; slot++)