diff --git a/Changes b/Changes
index 321e00d1b..1452d3e31 100644
--- a/Changes
+++ b/Changes
@@ -1431,3 +1431,6 @@
 ** 3.2.6 release **
 - Fixed bug where SVSO was unable to give various operflags such as q, d, X, reported
   by prodigy2k7 (#0003203).
+- /WHOIS now shows the ident of local users - if ident enabled and they had an ident -
+  instead of always "*" in the 'is connecting from' line. Suggested and patch provided
+  by djGrrr (#0002888).
diff --git a/src/modules/m_whois.c b/src/modules/m_whois.c
index 1135202f5..7c14fd380 100644
--- a/src/modules/m_whois.c
+++ b/src/modules/m_whois.c
@@ -195,7 +195,8 @@ DLLFUNC int  m_whois(aClient *cptr, aClient *sptr, int parc, char *parv[])
 			{
 				sendto_one(sptr, rpl_str(RPL_WHOISHOST),
 				    me.name, parv[0], acptr->name,
-				    user->realhost, user->ip_str ? user->ip_str : "");
+					(MyConnect(acptr) && strcmp(acptr->username, "unknown")) ? acptr->username : "*",
+					user->realhost, user->ip_str ? user->ip_str : "");
 			}
 
 			if (IsARegNick(acptr))
diff --git a/src/s_err.c b/src/s_err.c
index 1296d029f..cd49d7e45 100644
--- a/src/s_err.c
+++ b/src/s_err.c
@@ -415,7 +415,7 @@ static char *replies[] = {
 /* 375    RPL_MOTDSTART */ ":%s 375 %s :- %s Message of the Day - ",
 /* 376    RPL_ENDOFMOTD */ ":%s 376 %s :End of /MOTD command.",
 /* 377 */ NULL, /* aircd, austhex */
-/* 378    RPL_WHOISHOST */ ":%s 378 %s %s :is connecting from *@%s %s",
+/* 378    RPL_WHOISHOST */ ":%s 378 %s %s :is connecting from %s@%s %s",
 /* 379    RPL_WHOISMODES */ ":%s 379 %s %s :is using modes %s %s",
 /* 380 */ NULL, /* aircd, austhex */
 /* 381    RPL_YOUREOPER */ ":%s 381 %s :You are now an IRC Operator",