diff --git a/ext/comment/theme.php b/ext/comment/theme.php
index ed831dad..edd6ec0d 100644
--- a/ext/comment/theme.php
+++ b/ext/comment/theme.php
@@ -153,10 +153,10 @@ class CommentListTheme extends Themelet {
 				$anoncode = '<sup>'.$this->anon_id.'</sup>';
 				$this->anon_id++;
 			}
-			$h_userlink = $h_name . $anoncode;
+			$h_userlink = "<span class='username'>" . $h_name . $anoncode . "</span>";
 		}
 		else {
-			$h_userlink = '<a href="'.make_link('user/'.$h_name).'">'.$h_name.'</a>';
+			$h_userlink = '<a class="username" href="'.make_link('user/'.$h_name).'">'.$h_name.'</a>';
 		}
 		$stripped_nonl = str_replace("\n", "\\n", substr($tfe->stripped, 0, 50));
 		$stripped_nonl = str_replace("\r", "\\r", $stripped_nonl);
diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index cee7268b..42f1bf87 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -42,7 +42,7 @@ class TagEditTheme extends Themelet {
 			<tr>
 				<td>User</td>
 				<td>
-					<span class='view'><a href='".make_link("user/$h_owner")."'>$h_owner</a>$ip, $h_date</span>
+					<span class='view'><a class='username' href='".make_link("user/$h_owner")."'>$h_owner</a>$ip, $h_date</span>
 					<input class='edit' type='text' name='tag_edit__owner' value='$h_owner'>
 				</td>
 				<td width='80px' rowspan='4'>$h_av</td>