diff -ruN orig-rc4/modules/m_whois.c identactually-rc4/modules/m_whois.c
--- orig-rc4/modules/m_whois.c	Mon Apr  5 21:46:20 2004
+++ identactually-rc4/modules/m_whois.c	Sat May  8 21:43:47 2004
@@ -300,7 +300,7 @@
 		if(ConfigFileEntry.use_whois_actually && show_ip(source_p, target_p))
 			sendto_one_numeric(source_p, RPL_WHOISACTUALLY,
 					   form_str(RPL_WHOISACTUALLY),
-					   target_p->name, target_p->sockhost);
+					   target_p->name, target_p->username, target_p->sockhost);
 
 		sendto_one_numeric(source_p, RPL_WHOISIDLE, form_str(RPL_WHOISIDLE),
 				   target_p->name, 
@@ -314,7 +314,7 @@
 		{
 			sendto_one_numeric(source_p, RPL_WHOISACTUALLY,
 					   form_str(RPL_WHOISACTUALLY),
-					   target_p->name, target_p->sockhost);
+					   target_p->name, target_p->username, target_p->sockhost);
 			
 		}
 	
diff -ruN orig-rc4/src/messages.tab identactually-rc4/src/messages.tab
--- orig-rc4/src/messages.tab	Mon Apr 12 18:22:19 2004
+++ identactually-rc4/src/messages.tab	Sat May  8 21:44:06 2004
@@ -360,7 +360,7 @@
 /* 335 */       NULL,
 /* 336 */       NULL,
 /* 337 */       NULL,
-/* 338 RPL_WHOISACTUALLY, */	"%s %s :actually using host",
+/* 338 RPL_WHOISACTUALLY, */	"%s %s@%s :actually using host",
 /* 339 */       NULL,
 /* 340 */       NULL,
 /* 341 RPL_INVITING, */         ":%s 341 %s %s %s",