diff --git a/files/classes/comment.py b/files/classes/comment.py
index 4624738cdb..d973a87874 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'"> - {o.upvotes} votes'
+
+ if self.author.sig_html and not self.ghost and (self.author_id == MOOSE_ID or not (v and v.sigs_disabled)):
+ body += "
{self.author.sig_html}"
+
return body
def plainbody(self, v):
diff --git a/files/classes/submission.py b/files/classes/submission.py
index b61765a590..9dd94b61b2 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 += "
{self.author.sig_html}"
+
return body
def plainbody(self, v):
diff --git a/files/templates/comments.html b/files/templates/comments.html
index be52fca538..b444d71ad5 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -252,11 +252,6 @@
{% if c.parent_submission %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index ab3b0ba10f..64ecc21814 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -546,13 +546,6 @@
{% endif %}
-
-
- {% if p.author.sig_html and not p.ghost and (p.author_id == MOOSE_ID or not (v and v.sigs_disabled)) %}
-
- {{p.author.sig_html | safe}}
- {% endif %}
-
{% 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 71006dc866..53b96c1434 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -515,11 +515,6 @@
{% if p.realbody(v) %}
{{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)) %}
-
- {{p.author.sig_html | safe}}
- {% endif %}
{% endif %}
- {{c.author.sig_html | safe}} - {% endif %}