diff --git a/modules/m_testline.c b/modules/m_testline.c
index 215f48d9..ee1cca66 100644
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -178,14 +178,19 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 
 		if(aconf->status & CONF_KILL)
 		{
+			char *user, *host, *reason, *operreason;
+			char reasonbuf[BUFSIZE];
+			get_printable_kline(source_p, aconf, &host, &reason, &user, &operreason);
 			rb_snprintf(buf, sizeof(buf), "%s@%s", 
-					aconf->user, aconf->host);
+					user, host);
+			rb_snprintf(reasonbuf, sizeof(reasonbuf), "%s%s%s", reason,
+				operreason ? "|" : "", operreason ? operreason : "");
 			sendto_one(source_p, form_str(RPL_TESTLINE),
 				me.name, source_p->name,
 				(aconf->flags & CONF_FLAGS_TEMPORARY) ? 'k' : 'K',
 				(aconf->flags & CONF_FLAGS_TEMPORARY) ? 
 				 (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
-				buf, aconf->passwd);
+				buf, reasonbuf);
 			return 0;
 		}
 	}