diff --git a/data/scripts/talkactions/god/manage_kv.lua b/data/scripts/talkactions/god/manage_kv.lua
index 4d11a32d943..3d9a0c1be93 100644
--- a/data/scripts/talkactions/god/manage_kv.lua
+++ b/data/scripts/talkactions/god/manage_kv.lua
@@ -1,11 +1,22 @@
 local get = TalkAction("/getkv")
 
 function get.onSay(player, words, param)
-	local value = kv.get(param)
+	local key, playerName = string.splitFirst(param, ",")
+	if not playerName then
+		playerName = player:getName()
+	end
+
+	local targetPlayer = Player(playerName)
+	if not targetPlayer then
+		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Player " .. playerName .. " not found.")
+		return
+	end
+
+	local value = targetPlayer:kv():get(key)
 	if value then
-		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "kv[" .. param .. "]: " .. PrettyString(value))
+		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "kv[" .. key .. "] for " .. playerName .. ": " .. PrettyString(value))
 	else
-		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Key " .. param .. " not found.")
+		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Key " .. key .. " not found for " .. playerName .. ".")
 	end
 end
 
@@ -13,13 +24,83 @@ get:separator(" ")
 get:groupType("god")
 get:register()
 
+local getAllKV = TalkAction("/getallkv")
+
+function getAllKV.onSay(player, words, param)
+	local playerName = param
+	if not playerName or playerName == "" then
+		playerName = player:getName()
+	end
+
+	local targetPlayer = Player(playerName)
+	if not targetPlayer then
+		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Player " .. playerName .. " not found.")
+		return
+	end
+
+	local kv = targetPlayer:kv()
+	if not kv then
+		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Error: target player does not have a KV instance.")
+		return
+	end
+
+	local found = false
+	local keys = kv:keys()
+	if not keys then
+		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "No keys found.")
+		return
+	end
+
+	for _, key in ipairs(keys) do
+		local value = kv:get(key)
+		if type(value) == "number" and value >= 0 then
+			player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "kv[" .. key .. "] = " .. PrettyString(value))
+			found = true
+		end
+	end
+
+	if not found then
+		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "No KV found with value >= 0 for " .. playerName .. ".")
+	end
+end
+
+getAllKV:separator(" ")
+getAllKV:groupType("god")
+getAllKV:register()
+
 local set = TalkAction("/setkv")
 
 function set.onSay(player, words, param)
-	local key, value = string.splitFirst(param, ",") -- With a space some KV's are not able to be edited due to spaces within the key names, changed to a comma (,) to overcome this issue
-	value = load("return " .. value)()
-	kv.set(key, value)
-	player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "kv[" .. key .. "] = " .. PrettyString(value))
+	local key, rest = string.splitFirst(param, ",")
+	if not key or not rest then
+		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Usage: /setkv <key>,<value>[,<playerName>]")
+		return false
+	end
+
+	local value, playerName = string.splitFirst(rest, ",")
+	local targetPlayer = player
+	if playerName then
+		local creature = Creature(playerName)
+		if creature and creature:isPlayer() then
+			targetPlayer = creature:getPlayer()
+		else
+			player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Player '" .. playerName .. "' not found or is not a valid player.")
+			return false
+		end
+	end
+	local success, parsedValue = pcall(load("return " .. value))
+	if not success then
+		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Invalid value format.")
+		return false
+	end
+	local kv = targetPlayer:kv()
+	if not kv then
+		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Error: target player does not have a KV instance.")
+		return false
+	end
+	kv:set(key, parsedValue)
+	player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "KV: [" .. key .. "] = " .. PrettyString(parsedValue) .. " set for " .. targetPlayer:getName())
+	return true
 end
 
 set:separator(" ")