diff --git a/kike.c b/kike.c
index 9c85940..5edf9e9 100644
--- a/kike.c
+++ b/kike.c
@@ -2541,7 +2541,8 @@ irc_handle_topic (const struct irc_message *msg, struct client *c)
 	free (chan->topic);
 	free (chan->topic_who);
 	chan->topic = xstrdup (msg->params.vector[1]);
-	chan->topic_who = xstrdup (msg->prefix);
+	chan->topic_who = xstrdup_printf
+		("%s!%s@%s", c->nickname, c->username, c->hostname);
 	chan->topic_time = time (NULL);
 
 	char *message = xstrdup_printf (":%s!%s@%s TOPIC %s :%s",