diff --git a/Changes b/Changes
index 4a969ccbb..d37223bf4 100644
--- a/Changes
+++ b/Changes
@@ -1514,3 +1514,9 @@
 - Italic fix in serverprotocol
 - 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).
+  NOTE: This needs checking, this patch changed the 'unknown' stuff to ~.. doublecheck
+  the allow block and everything.. didn't we use unknown@ there sometimes? I'll leave this
+  to someone else...
diff --git a/src/list.c b/src/list.c
index 506bece72..0680d1921 100644
--- a/src/list.c
+++ b/src/list.c
@@ -133,7 +133,7 @@ aClient *make_client(aClient *from, aClient *servr)
 	cptr->srvptr = servr;
 	cptr->status = STAT_UNKNOWN;
 	
-	(void)strcpy(cptr->username, "unknown");
+	(void)strcpy(cptr->username, "~");
 	if (size == CLIENT_LOCAL_SIZE)
 	{
 		cptr->since = cptr->lasttime =
diff --git a/src/modules/m_whois.c b/src/modules/m_whois.c
index d5b8d2d4a..823442acc 100644
--- a/src/modules/m_whois.c
+++ b/src/modules/m_whois.c
@@ -195,6 +195,7 @@ 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,
+				    (MyConnect(acptr) && *acptr->username != '~') ? acptr->username : "*",
 				    user->realhost, user->ip_str ? user->ip_str : "");
 			}
 
diff --git a/src/s_err.c b/src/s_err.c
index 7adae5dc0..77c8c3589 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",