diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index ab1d13ce06..bd38a2da3e 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,7 @@
+October 4, 2009  (Changes by Graf Zahl)
+- Fixed: The conversation code tried to get the player's tag instead of the
+  NPC's he is talking to when it had no given name.
+
 October 3, 2009  (Changes by Graf Zahl)
 - Added Gez's MageWandMissile customization patch but moved the new functionality
   into the FastProjectile base class and removed the native MageWandMissile
diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp
index 94feffe95e..23147343b1 100644
--- a/src/p_conversation.cpp
+++ b/src/p_conversation.cpp
@@ -875,7 +875,7 @@ static void DrawConversationMenu ()
 	}
 	else
 	{
-		speakerName = cp->mo->GetTag("Person");
+		speakerName = cp->ConversationNPC->GetTag("Person");
 	}
 
 	// Dim the screen behind the dialogue (but only if there is no backdrop).