diff --git a/src/UserInterface/PythonNetworkStreamPhaseGameActor.cpp b/src/UserInterface/PythonNetworkStreamPhaseGameActor.cpp
index 775605c..296b65e 100644
--- a/src/UserInterface/PythonNetworkStreamPhaseGameActor.cpp
+++ b/src/UserInterface/PythonNetworkStreamPhaseGameActor.cpp
@@ -158,7 +158,18 @@ bool CPythonNetworkStream::RecvCharacterAdditionalInfo()
 
 	if(kNetActorData.m_dwVID == chrInfoPacket.dwVID)
 	{
-		kNetActorData.m_stName = chrInfoPacket.name;
+		if (kNetActorData.m_bType == CActorInstance::TYPE_NPC)
+		{
+			const char* c_szName;
+			if (CPythonNonPlayer::Instance().GetName(kNetActorData.m_dwRace, &c_szName))
+				kNetActorData.m_stName = c_szName;
+			else
+				kNetActorData.m_stName = chrInfoPacket.name;
+		}
+		else
+		{
+			kNetActorData.m_stName = chrInfoPacket.name;
+		}
 		kNetActorData.m_dwGuildID = chrInfoPacket.dwGuildID;
 		kNetActorData.m_dwLevel = chrInfoPacket.dwLevel;
 		kNetActorData.m_sAlignment=chrInfoPacket.sAlignment;