diff --git a/src/egs_game.erl b/src/egs_game.erl
index 1aca877..65c7d20 100644
--- a/src/egs_game.erl
+++ b/src/egs_game.erl
@@ -481,7 +481,7 @@ event({npc_force_invite, NPCid}, Client=#client{gid=GID}) ->
 	psu_proto:send_010d(SentNPCUser, Client),
 	psu_proto:send_0201(SentNPCUser, Client),
 	psu_proto:send_0215(0, Client),
-	psu_game:send_0a04(SentNPCUser#users.gid),
+	psu_proto:send_0a04(SentNPCUser#users.gid, Client),
 	psu_proto:send_022c(0, 16#12, Client),
 	psu_game:send_1004(npc_mission, SentNPCUser, PartyPos),
 	psu_proto:send_100f((SentNPCUser#users.character)#characters.npcid, PartyPos, Client),
diff --git a/src/psu/psu_game.erl b/src/psu/psu_game.erl
index b263393..93c0acd 100644
--- a/src/psu/psu_game.erl
+++ b/src/psu/psu_game.erl
@@ -119,7 +119,7 @@ npc_load(Leader, [{PartyPos, NPCGID}|NPCList], Client) ->
 	psu_proto:send_010d(NPCUser, Client),
 	psu_proto:send_0201(NPCUser, Client),
 	psu_proto:send_0215(0, Client),
-	send_0a04(NPCUser#users.gid),
+	psu_proto:send_0a04(NPCUser#users.gid, Client),
 	send_1004(npc_mission, NPCUser, PartyPos),
 	psu_proto:send_100f((NPCUser#users.character)#characters.npcid, PartyPos, Client),
 	psu_proto:send_1601(PartyPos, Client),
@@ -174,12 +174,6 @@ send_0503({PrevX, PrevY, PrevZ, _AnyDir}) ->
 		16#1000:16, IntDir:16/little, PrevX:32/little-float, PrevY:32/little-float, PrevZ:32/little-float, X:32/little-float, Y:32/little-float, Z:32/little-float,
 		QuestID:32/little, ZoneID:32/little, MapID:32/little, EntryID:32/little, 1:32/little >>).
 
-%% @todo NPC inventory. Guessing it's only for NPC characters...
-send_0a04(NPCGID) ->
-	GID = get(gid),
-	{ok, Bin} = file:read_file("p/packet0a04.bin"),
-	send(<< 16#0a040300:32, 0:32, 16#00001d00:32, NPCGID:32/little, 0:64, 16#00011300:32, GID:32/little, 0:64, Bin/binary >>).
-
 %% @todo Handle more than just goggles.
 send_0a0a(Inventory) ->
 	{ok, << _:68608/bits, Rest/bits >>} = file:read_file("p/packet0a0a.bin"),
diff --git a/src/psu/psu_proto.erl b/src/psu/psu_proto.erl
index 64bbcc8..c2c5216 100644
--- a/src/psu/psu_proto.erl
+++ b/src/psu/psu_proto.erl
@@ -1423,6 +1423,12 @@ send_0304(FromGID, ChatTypeID, ChatGID, ChatName, ChatModifiers, ChatMessage, #c
 		ChatTypeID:32, ChatGID:32/little, 0:64, ChatType:8, ChatCutIn:8, ChatCutInAngle:8, ChatMsgLength:8,
 		ChatChannel:8, ChatCharacterType:8, 0:16, ChatName/binary, ChatMessage/binary >>).
 
+%% @todo NPC inventory. Guessing it's only for NPC characters...
+%% @todo This packet hasn't been reviewed at all yet.
+send_0a04(NPCGID, #client{socket=Socket, gid=DestGID}) ->
+	{ok, Bin} = file:read_file("p/packet0a04.bin"),
+	packet_send(Socket, << 16#0a040300:32, 0:32, 16#00001d00:32, NPCGID:32/little, 0:64, 16#00011300:32, DestGID:32/little, 0:64, Bin/binary >>).
+
 %% @todo Inventory related. Doesn't seem to do anything.
 send_0a05(#client{socket=Socket, gid=DestGID, lid=DestLID}) ->
 	packet_send(Socket, << 16#0a050300:32, DestLID:16/little, 0:144, 16#00011300:32, DestGID:32/little, 0:64 >>).