diff --git a/files/templates/submission.html b/files/templates/submission.html
index e4abe9b936..6b51cb3c28 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -279,7 +279,7 @@
 						{% if p.author.verified %}
 						<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 %}
-						<a class="flex items-center font-heading" 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;" class="user-name">
+						<button class="flex items-center font-heading 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}};">
 								{{p.author.username}}
@@ -293,7 +293,7 @@
 								{{p.author.username}}
 							</span>
 							{% endif %}
-						</a>
+						</button>
 
 						{% if p.author.customtitle %}
 						<bdi style="color: #{{p.author.titlecolor}}">
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index aff6359aa0..66d13b61e0 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -78,8 +78,20 @@
 				{% if p.author.verified %}<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 %}
 				{% if not p.award_count('ghosts') %}
-				<button class="flex items-center font-heading" 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}};">
-					<span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level and 'rama' in request.host %}class="mod"{% endif %}>{{p.author.username}}</span>
+				<button class="flex items-center font-heading 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}};">
+					{% 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 %}
+					<span>
+						{{p.author.username}}
+					</span>
+					{% endif %}
 				</button>
 				{% if p.author.customtitle %}
 				<bdi style="color: #{{p.author.titlecolor}}">&nbsp;&nbsp;