--- a/mercurial/hgweb.py	Sun Aug 28 16:41:16 2005 +0200
+++ b/mercurial/hgweb.py	Sun Aug 28 17:29:28 2005 +0200
@@ -507,14 +507,7 @@
                     name = bcache[r]
                 except KeyError:
                     cl = self.repo.changelog.read(cnode)
-                    name = cl[1]
-                    f = name.find('@')
-                    if f >= 0:
-                        name = name[:f]
-                    f = name.find('<')
-                    if f >= 0:
-                        name = name[f+1:]
-                    bcache[r] = name
+                    bcache[r] = name = self.repo.ui.shortuser(cl[1])
 
                 if last != cnode:
                     parity = 1 - parity