diff --git a/files/templates/comments.html b/files/templates/comments.html
index adaa7aef80..320776a0e0 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -155,7 +155,9 @@
{% for f in c.ordered_flags %}
- - {{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v.admin_level==6 %}[remove]{% endif %}
+ {% if not f.user.shadowbanned or (v and v.shadowbanned) %}
+ - {{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v.admin_level==6 %}[remove]{% endif %}
+ {% endif %}
{% endfor %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 28acbe3dbd..71c824e2f1 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -281,7 +281,9 @@
{% for f in p.ordered_flags %}
- - {{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v.admin_level==6 %}[remove]{% endif %}
+ {% if not f.user.shadowbanned or (v and v.shadowbanned) %}
+ - {{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v.admin_level==6 %}[remove]{% endif %}
+ {% endif %}
{% endfor %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 544c1e3c0b..46675602bf 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -375,7 +375,9 @@
{% for f in p.ordered_flags %}
- - {{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v.admin_level==6 %}[remove]{% endif %}
+ {% if not f.user.shadowbanned or (v and v.shadowbanned) %}
+ - {{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v.admin_level==6 %}[remove]{% endif %}
+ {% endif %}
{% endfor %}