diff --git a/files/templates/comments.html b/files/templates/comments.html
index 0122e86df..e9a22d41a 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -139,7 +139,7 @@
 
 	<div class="ml-3 mr-3 my-2">
 		{% for b in c.author.badges %}
-			{% if c.author.url %}
+			{% if b.url %}
 				<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img width="32" loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="{{b.name}} - {{b.text}}"></a>
 			{% else %}
 				<img width="32" loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="{{b.name}} - {{b.text}}">
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 90163ffac..4a20ffc7b 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -272,7 +272,7 @@
 
 	  <div class="ml-3 mr-3 my-2">
 		{% for b in p.author.badges %}
-			{% if p.author.url %}
+			{% if b.url %}
 				<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img width="32" loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="{{b.name}} - {{b.text}}"></a>
 			{% else %}
 				<img width="32" loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="{{b.name}} - {{b.text}}">
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index c0a68948d..1d2ecdb88 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -49,7 +49,7 @@
 
 		<div class="ml-3 mr-3 my-2">
 			{% for b in p.author.badges %}
-				{% if p.author.url %}
+				{% if b.url %}
 					<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img width="32" loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="{{b.name}} - {{b.text}}"></a>
 				{% else %}
 					<img width="32" loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="{{b.name}} - {{b.text}}">