diff --git a/en_US.ISO8859-1/htdocs/administration.xml b/en_US.ISO8859-1/htdocs/administration.xml
index 5e8f481041..a41ca6f169 100644
--- a/en_US.ISO8859-1/htdocs/administration.xml
+++ b/en_US.ISO8859-1/htdocs/administration.xml
@@ -213,7 +213,7 @@
       href="mailto:denise@ixsystems.com">denise@ixsystems.com</a>&gt;</li>
     <li>&a.deb.email;</li>
     <li>&a.jkoshy.email;</li>
-    <li>&a.dru.email; &lt;</li>
+    <li>&a.dru.email;</li>
     <li>&a.mwlucas.email;</li>
     <li>&a.imp.email;</li>
     <li>&a.kmoore.email;</li>
@@ -333,8 +333,8 @@
   <p>The Backups Administrators handle all backups on the FreeBSD cluster.</p>
 
   <ul>
-    <li>&a.simon;</li>
-    <li>&a.dhw;</li>
+    <li>&a.simon.email;</li>
+    <li>&a.dhw.email;</li>
   </ul>
 
   <h3><a name="t-bugmeister">Bugmeisters &amp; GNATS Administrators</a>
@@ -400,10 +400,10 @@
     services.</p>
 
   <ul>
-    <li>&a.brd;</li>
-    <li>&a.simon;</li>
-    <li>&a.peter;</li>
-    <li>&a.bz;</li>
+    <li>&a.brd.email;</li>
+    <li>&a.simon.email;</li>
+    <li>&a.peter.email;</li>
+    <li>&a.bz.email;</li>
   </ul>
 
   <h3><a name="t-mirror-admin">FTP/WWW Mirror Site Coordinators</a>
@@ -462,9 +462,9 @@
 	the Subversion Repositories.</p>
 
   <ul>
-    <li>&a.bz; &lt;<a href="mailto:bz@FreeBSD.org">bz@FreeBSD.org</a>&gt;</li>
-    <li>&a.peter; &lt;<a href="mailto:peter@FreeBSD.org">peter@FreeBSD.org</a>&gt;</li>
-    <li>&a.simon; &lt;<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>&gt;</li>
+    <li>&a.bz.email;</li>
+    <li>&a.peter.email;</li>
+    <li>&a.simon.email;</li>
   </ul>
 
   <h3><a name="t-webmaster">Webmaster Team</a>