diff --git a/Changes b/Changes
index f1fc0e8c0..39943c7e9 100644
--- a/Changes
+++ b/Changes
@@ -571,3 +571,6 @@
 - Fixed ban merging/similar bug in SJOIN
 - Made /kick for opers only be possible for netadmin/techadmin
 - Fixed /server so it doesnt support SERVER name :info anymore..
+
+[ this is 4.0 ]
+- Fixed /userhost showing "unknown" as username for a lot of people
diff --git a/src/s_user.c b/src/s_user.c
index fe8beab4e..517b50030 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -4049,7 +4049,7 @@ int  m_userhost(cptr, sptr, parc, parv)
                      acptr->name,
                      IsAnOper(acptr) ? "*" : "",
                      (acptr->user->away) ? '-' : '+',
-                     acptr->username,
+                     acptr->user->username,
    			((acptr != sptr) && !IsOper(sptr) 
    			  && IsHidden(acptr) ? acptr->user->virthost : 
    			  acptr->user->realhost));