diff --git a/files/templates/comments.html b/files/templates/comments.html
index 1063dcfc67..29aff04abd 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -292,19 +292,19 @@
 					</div>
 
 					<a class="user-name" data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="focus" data-content-id="popover-{{c.id}}" href="javascript:void(0)" tabindex="0" style="color:#{{c.author.namecolor}};">
-						{% if c.author.patron and not c.distinguish_level %}
-						<span class="patron" style="background-color:#{{c.author.namecolor}};">
+						<span class="text-sm font-bold">
+							{% if c.author.patron and not c.distinguish_level %}
+							<span class="patron" style="background-color:#{{c.author.namecolor}};">
+								{{c.author.username}}
+							</span>
+							{% elif c.distinguish_level and 'rama' in request.host %}
+							<span class="mod" style="background-color:#{{c.author.namecolor}};">
+								{{c.author.username}}
+							</span>
+							{% else %}
 							{{c.author.username}}
+							{% endif %}
 						</span>
-						{% elif c.distinguish_level and 'rama' in request.host %}
-						<span class="mod" style="background-color:#{{c.author.namecolor}};">
-							{{c.author.username}}
-						</span>
-						{% else %}
-						<span>
-							{{c.author.username}}
-						</span>
-						{% endif %}
 					</a>
 
 					{% if c.author.customtitle %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 3671215974..c4a1d25988 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -356,21 +356,21 @@
 						<i class="fas fa-badge-check align-middle ml-1" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="{{p.author.verified}}"></i>
 						{% endif %}
 						</span>
-						<button class="inline-flex flex-shrink-0 items-center font-bold" data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="focus" data-content-id="popover-{{p.id}}" tabindex="0" style="color: #{{p.author.namecolor}}; font-weight: bold;" class="user-name">
-							{% if p.author.patron and not p.distinguish_level %}
-							<span class="patron" style="background-color:#{{p.author.namecolor}};">
+						<a class="user-name" data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="focus" data-content-id="popover-{{p.id}}" href="javascript:void(0)" tabindex="0" style="color: #{{p.author.namecolor}}; font-weight: bold;">
+							<span class="inline-flex flex-shrink-0 items-center font-bold">
+								{% if p.author.patron and not p.distinguish_level %}
+								<span class="patron" style="background-color:#{{p.author.namecolor}};">
+									{{p.author.username}}
+								</span>
+								{% elif p.distinguish_level and 'rama' in request.host %}
+								<span class="mod">
+									{{p.author.username}}
+								</span>
+								{% else %}
 								{{p.author.username}}
+								{% endif %}
 							</span>
-							{% elif p.distinguish_level and 'rama' in request.host %}
-							<span class="mod">
-								{{p.author.username}}
-							</span>
-							{% else %}
-							<span>
-								{{p.author.username}}
-							</span>
-							{% endif %}
-						</button>
+						</a>
 
 						{% if p.author.customtitle %}
 						<bdi class="flex-shrink-0" style="color: #{{p.author.titlecolor}}">
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 3278f7e361..f267436de1 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -112,20 +112,20 @@
 				</span>
 				{% endif %}
 				{% if not p.award_count('ghosts') %}
-				<a class="inline-flex flex-shrink-0 items-center font-bold" data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="focus" data-content-id="popover-{{p.id}}" style="color: #{{p.author.namecolor}};">
-					{% if p.author.patron and not p.distinguish_level %}
-					<span class="patron" style="background-color:#{{p.author.namecolor}};">
+				<a class="user-name" data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="focus" data-content-id="popover-{{p.id}}" style="color: #{{p.author.namecolor}};">
+					<span class="inline-flex flex-shrink-0 items-center font-bold">
+						{% if p.author.patron and not p.distinguish_level %}
+						<span class="patron" style="background-color:#{{p.author.namecolor}};">
+							{{p.author.username}}
+						</span>
+						{% elif p.distinguish_level and 'rama' in request.host %}
+						<span class="mod">
+							{{p.author.username}}
+						</span>
+						{% else %}
 						{{p.author.username}}
+						{% endif %}
 					</span>
-					{% elif p.distinguish_level and 'rama' in request.host %}
-					<span class="mod">
-						{{p.author.username}}
-					</span>
-					{% else %}
-					<span>
-						{{p.author.username}}
-					</span>
-					{% endif %}
 				</a>
 				{% if p.author.customtitle %}
 					<bdi class="flex-shrink-0" style="color: #{{p.author.titlecolor}}">