diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py
+++ b/mercurial/hgweb/webcommands.py
@@ -464,7 +464,6 @@ def annotate(web, req, tmpl):
lines = enumerate(fctx.annotate(follow=True, linenumber=True))
for lineno, ((f, targetline), l) in lines:
fnode = f.filenode()
- name = web.repo.ui.shortuser(f.user())
if last != fnode:
last = fnode
@@ -472,7 +471,7 @@ def annotate(web, req, tmpl):
yield {"parity": parity.next(),
"node": hex(f.node()),
"rev": f.rev(),
- "author": name,
+ "author": f.user(),
"file": f.path(),
"targetline": targetline,
"line": l,
diff --git a/templates/coal/map b/templates/coal/map
--- a/templates/coal/map
+++ b/templates/coal/map
@@ -30,7 +30,7 @@ filelog = filelog.tmpl
fileline = '
{linenumber} | {line|escape} |
'
filelogentry = filelogentry.tmpl
-annotateline = '{author|obfuscate}@{rev} | {linenumber} | {line|escape} |
'
+annotateline = '{author|user}@{rev} | {linenumber} | {line|escape} |
'
diffblock = ''
difflineplus = '{linenumber} | {line|escape} |
'
diff --git a/templates/gitweb/map b/templates/gitweb/map
--- a/templates/gitweb/map
+++ b/templates/gitweb/map
@@ -24,7 +24,7 @@ fileannotate = fileannotate.tmpl
filediff = filediff.tmpl
filelog = filelog.tmpl
fileline = ''
-annotateline = '#author|obfuscate#@#rev# | #linenumber# | #line|escape# |
'
+annotateline = '#author|user#@#rev# | #linenumber# | #line|escape# |
'
difflineplus = '#linenumber# #line|escape#'
difflineminus = '#linenumber# #line|escape#'
difflineat = '#linenumber# #line|escape#'
diff --git a/templates/map b/templates/map
--- a/templates/map
+++ b/templates/map
@@ -24,7 +24,7 @@ filediff = filediff.tmpl
filelog = filelog.tmpl
fileline = ''
filelogentry = filelogentry.tmpl
-annotateline = '#author|obfuscate#@#rev# | #linenumber# | #line|escape# |
'
+annotateline = '#author|user#@#rev# | #linenumber# | #line|escape# |
'
difflineplus = '#linenumber##line|escape#'
difflineminus = '#linenumber##line|escape#'
difflineat = '#linenumber##line|escape#'