diff --git a/files/templates/comments.html b/files/templates/comments.html
index 08907459a..87a7b1886 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -138,6 +138,18 @@
 				<span class="time-edited"><span>&#183;</span> <span class="font-italic">Edited {{c.edited_string}}</span></span>
 				{% endif %}
 			</div>
+			
+			{% if c.active_flags %}
+			<div id="flaggers-{{c.id}}" class="flaggers d-none">
+				<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
+				<pre></pre>
+				<ul style="padding-left:20px; margin-bottom: 0;">
+					{% for f in c.ordered_flags %}
+						<li><a style="font-weight:bold" href="{{f.user.url}}">@{{f.user.username}}</a>{% if f.reason %}: {{f.reason | safe}}{% endif %}</li>
+					{% endfor %}
+				</ul>
+			</div>
+			{% endif %}
 
 			{% if c.is_banned and c.ban_reason %}
 			<div id="comment-banned-warning" class="comment-text text-danger text-small mb-0">Reason: {{c.ban_reason}}</div>
@@ -192,18 +204,6 @@
 				</form>
 			</div>
 			{% endif %}
-
-			{% if c.active_flags %}
-			<div id="flaggers-{{c.id}}" class="flaggers d-none">
-				<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
-				<pre></pre>
-				<ul style="padding-left:20px; margin-bottom: 0;">
-					{% for f in c.ordered_flags %}
-						<li><a style="font-weight:bold" href="{{f.user.url}}">@{{f.user.username}}</a>{% if f.reason %}: {{f.reason | safe}}{% endif %}</li>
-					{% endfor %}
-				</ul>
-			</div>
-			{% endif %}
 		
 			<div id="comment-{{c.id}}-actions" class="comment-actions{% if voted==1 %} upvoted{% elif voted==-1 %} downvoted{% endif %}">
 				<ul class="list-inline text-right text-md-left">
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 191cd9206..edc5319c4 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -234,6 +234,18 @@
 						&nbsp;&nbsp;{{p.views}} views
 					</div>
 					
+					{% if p.active_flags %}
+					<div id="flaggers" class="flaggers d-none">
+						<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
+						<pre></pre>
+						<ul style="padding-left:20px; margin-bottom: 0;">
+							{% for f in p.ordered_flags %}
+								<li><a style="font-weight:bold" href="{{f.user.url}}">@{{f.user.username}}</a>{% if f.reason %}: {{f.reason | safe}}{% endif %}</li>
+							{% endfor %}
+						</ul>
+					</div>
+					{% endif %}
+				
 					{% if p.realurl(v) %}
 						<h1 id="post-title" class="card-title post-title text-left mb-md-3"><a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="noopener noreferrer" href="{{p.realurl(v)}}" rel="nofollow noopener">{{title | safe}}</a></h1>					
 					{% else %}
@@ -494,18 +506,6 @@
 
 </div>
 
-{% if p.active_flags %}
-	<div id="flaggers" class="flaggers d-none">
-		<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
-		<pre></pre>
-		<ul style="padding-left:20px; margin-bottom: 0;">
-			{% for f in p.ordered_flags %}
-				<li><a style="font-weight:bold" href="{{f.user.url}}">@{{f.user.username}}</a>{% if f.reason %}: {{f.reason | safe}}{% endif %}</li>
-			{% endfor %}
-		</ul>
-	</div>
-{% endif %}
-
 <div class="row border-md-0 comment-section pb-3">
 	<div class="col border-top">
 		<div class="comments-count py-3">
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 35bf6d568..6b0f6e621 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -115,6 +115,18 @@
 				&nbsp;&nbsp;{{p.views}} views
 			</div>
 
+			{% if p.active_flags %}
+			<div id="flaggers-{{p.id}}" class="flaggers d-none">
+				<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
+				<pre></pre>
+				<ul style="padding-left:20px; margin-bottom: 0;">
+					{% for f in p.ordered_flags %}
+						<li><a style="font-weight:bold" href="{{f.user.url}}">@{{f.user.username}}</a>{% if f.reason %}: {{f.reason | safe}}{% endif %}</li>
+					{% endfor %}
+				</ul>
+			</div>
+			{% endif %}
+		
 			<h5 class="card-title post-title text-left w-lg-75 mb-0 pb-0 pb-md-1"><a {% if v and v.newtab %}target="_blank"{% endif %} {% if v %}href="{{p.permalink}}"{% else %}href="/logged_out{{p.permalink}}"{% endif %} class="stretched-link" {% if p.author.is_private %} rel="nofollow"{% endif %}>
 				{{p.realtitle(v) | safe}}
 			</a></h5>
@@ -374,20 +386,6 @@
 
 </div>
 
-{% if p.active_flags %}
-	<div id="flaggers-{{p.id}}" class="flaggers d-none">
-		<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
-		<pre></pre>
-		<ul style="padding-left:20px; margin-bottom: 0;">
-			{% for f in p.ordered_flags %}
-				<li><a style="font-weight:bold" href="{{f.user.url}}">@{{f.user.username}}</a>{% if f.reason %}: {{f.reason | safe}}{% endif %}</li>
-			{% endfor %}
-		</ul>
-	</div>
-{% endif %}
-
-{% else %}
-
 {% if request.path.endswith('/admin/queue') %}
 
 <div class="row no-gutters">	
diff --git a/files/templates/user_listing.html b/files/templates/user_listing.html
index 9224b579e..299cc8a98 100644
--- a/files/templates/user_listing.html
+++ b/files/templates/user_listing.html
@@ -21,8 +21,8 @@
 					{% endif %}
 				</div>
 
-				{% if not hide_bios %}
-				<div class="card-text">{{u.bio_html | safe}}</div>
+				{% if not hide_bios and u.bio_html %}
+					<div class="card-text">{{u.bio_html | safe}}</div>
 				{% endif %}
 			</div>
 		</div>