diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index b20891cb8..2ccfd26af 100755
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -34,7 +34,6 @@ Build =
       boardID:  boardID
       # info
       name:     Build.unescape data.name
-      capcode:  data.capcode
       tripcode: data.trip
       uniqueID: data.id
       email:    Build.unescape data.email
@@ -50,7 +49,9 @@ Build =
       isArchived: !!data.archived
       # file status
       fileDeleted: !!data.filedeleted
-    # file
+    if data.capcode
+      o.capcode = data.capcode.replace(/_highlight$/, '').replace(/_/g, ' ').replace(/\b\w/g, (c) -> c.toUpperCase())
+      o.capcodeHighlight = /_highlight$/.test data.capcode
     if data.ext
       o.file =
         name:      (Build.unescape data.filename) + data.ext
@@ -76,7 +77,7 @@ Build =
     ###
     {
       postID, threadID, boardID
-      name, capcode, tripcode, uniqueID, email, subject, flagCode, flagName, date, dateUTC
+      name, capcode, capcodeHighlight, tripcode, uniqueID, email, subject, flagCode, flagName, date, dateUTC
       comment
       file, fileDeleted
     } = o
@@ -88,16 +89,15 @@ Build =
     ### Post Info ###
 
     if capcode
-      capcodeLC = capcode.split('_')[0]
-      capcodeUC = capcodeLC[0].toUpperCase() + capcodeLC[1..]
-      capcodeText   = capcodeUC
-      capcodeLong   = {'Admin': 'Administrator', 'Mod': 'Moderator'}[capcodeUC] or capcodeUC
-      capcodePlural = "#{capcodeLong}s"
-      capcodeDescription = "a 4chan #{capcodeLong}"
-      if capcode is 'admin_emeritus'
-        capcodeText        = 'Admin Emeritus'
+      capcodeUC = capcode.split(' ')[0]
+      capcodeLC = capcodeUC.toLowerCase()
+      if capcode is 'Admin Emeritus'
         capcodePlural      = 'the Administrator Emeritus'
         capcodeDescription = "4chan's founding Administrator"
+      else
+        capcodeLong   = {'Admin': 'Administrator', 'Mod': 'Moderator'}[capcode] or capcode
+        capcodePlural = "#{capcodeLong}s"
+        capcodeDescription = "a 4chan #{capcodeLong}"
 
     postLink = Build.postURL boardID, threadID, postID
     quoteLink = if Build.sameThread boardID, threadID
diff --git a/src/General/html/Build/Post.html b/src/General/html/Build/Post.html
index fc2b36cca..4522081aa 100644
--- a/src/General/html/Build/Post.html
+++ b/src/General/html/Build/Post.html
@@ -1,5 +1,5 @@
 ?{!isOP}{<div class="sideArrows" id="sa${postID}">&gt;&gt;</div>}
-<div id="p${postID}" class="post ${postClass}?{capcode === "admin_highlight"}{ highlightPost}">
+<div id="p${postID}" class="post ${postClass}?{capcodeHighlight}{ highlightPost}">
   ?{isOP}{&{fileBlock}&{postInfo}}{&{postInfo}&{fileBlock}}
   <blockquote class="postMessage" id="m${postID}">&{comment}</blockquote>
 </div>
diff --git a/src/General/html/Build/PostInfo.html b/src/General/html/Build/PostInfo.html
index fbd848f5c..157b84df6 100644
--- a/src/General/html/Build/PostInfo.html
+++ b/src/General/html/Build/PostInfo.html
@@ -5,7 +5,7 @@
     ?{email}{<a href="mailto:${encodeURIComponent(email).replace(/%40/g, "@")}" class="useremail">}
       <span class="name?{capcode}{ capcode}">${name}</span>
       ?{tripcode}{ <span class="postertrip">${tripcode}</span>}
-      ?{capcode}{ <strong class="capcode hand id_${capcodeLC}" title="Highlight posts by ${capcodePlural}">## ${capcodeText}</strong>}
+      ?{capcode}{ <strong class="capcode hand id_${capcodeLC}" title="Highlight posts by ${capcodePlural}">## ${capcode}</strong>}
     ?{email}{</a>}
     ?{boardID === "f" && isOP || capcode}{}{ }
     ?{capcode}{ <img src="${staticPath}${capcodeLC}icon${gifIcon}" alt="${capcodeUC} Icon" title="This user is ${capcodeDescription}." class="identityIcon retina">}
diff --git a/src/General/lib/fetcher.class b/src/General/lib/fetcher.class
index 49baf9257..c604376b3 100644
--- a/src/General/lib/fetcher.class
+++ b/src/General/lib/fetcher.class
@@ -133,9 +133,9 @@ class Fetcher
       # info
       name:     data.name
       capcode:  switch data.capcode
-        when 'M' then 'mod'
-        when 'A' then 'admin'
-        when 'D' then 'developer'
+        when 'M' then 'Mod'
+        when 'A' then 'Admin'
+        when 'D' then 'Developer'
       tripcode: data.trip
       uniqueID: data.poster_hash
       email:    data.email or ''