diff --git a/files/classes/comment.py b/files/classes/comment.py
index 4624738cd..d973a8787 100644
--- a/files/classes/comment.py
+++ b/files/classes/comment.py
@@ -368,6 +368,10 @@ class Comment(Base):
 			if not self.total_poll_voted(v): body += ' d-none'	
 			body += f'"> - <a href="/votes?link=t3_{o.id}"><span id="poll-{o.id}">{o.upvotes}</span> votes</a></span></label></div>'
 
+
+		if self.author.sig_html and not self.ghost and (self.author_id == MOOSE_ID or not (v and v.sigs_disabled)):
+			body += "<hr>{self.author.sig_html}"
+
 		return body
 
 	def plainbody(self, v):
diff --git a/files/classes/submission.py b/files/classes/submission.py
index b61765a59..9dd94b61b 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -382,6 +382,9 @@ class Submission(Base):
 				g.db.add(self.author)
 				g.db.commit()
 
+		if self.author.sig_html and not self.ghost and (self.author_id == MOOSE_ID or not (v and v.sigs_disabled)):
+			body += "<hr>{self.author.sig_html}"
+
 		return body
 
 	def plainbody(self, v):
diff --git a/files/templates/comments.html b/files/templates/comments.html
index be52fca53..b444d71ad 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -252,11 +252,6 @@
 
 			<div id="comment-text-{{c.id}}" class="comment-text mb-0 {% if c.author.agendaposter %}agendaposter{% endif %}" >
 				{{c.realbody(v) | safe}}
-
-				{% if c.author.sig_html and not c.ghost and (c.author_id == MOOSE_ID or not (v and v.sigs_disabled)) %}
-					<hr>
-					{{c.author.sig_html | safe}}
-				{% endif %}
 			</div>
 			{% if c.parent_submission %}
 
diff --git a/files/templates/submission.html b/files/templates/submission.html
index ab3b0ba10..64ecc2181 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -546,13 +546,6 @@
 							{% endif %}
 
 						</div>
-
-
-						{% if p.author.sig_html and not p.ghost and (p.author_id == MOOSE_ID or not (v and v.sigs_disabled)) %}
-							<hr>
-							{{p.author.sig_html | safe}}
-						{% endif %}
-
 					</div>
 
 					{% if v and (v.id==p.author_id or v.admin_level > 2) and not v.is_suspended %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 71006dc86..53b96c143 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -515,11 +515,6 @@
 	{% if p.realbody(v) %}
 		<div class="d-none card rounded border pb-0 pt-3 my-2 {% if p.author.agendaposter %}agendaposter{% endif %}" id="post-text-{{p.id}}">
 			{{p.realbody(v) | safe}}
-
-			{% if p.author.sig_html and not p.ghost and (p.author_id == MOOSE_ID or not (v and v.sigs_disabled)) %}
-				<hr>
-				{{p.author.sig_html | safe}}
-			{% endif %}
 		</div>
 	{% endif %}