diff --git a/files/classes/comment.py b/files/classes/comment.py
index f92b328cd..b1cfa23bd 100644
--- a/files/classes/comment.py
+++ b/files/classes/comment.py
@@ -294,6 +294,9 @@ class Comment(Base):
 		if not self.ghost and self.author.show_sig(v):
 			body += f"<hr>{self.author.sig_html}"
 
+		if v:
+			body = body.replace("!YOU!", v.username)
+
 		return body
 
 	@lazy
@@ -309,6 +312,9 @@ class Comment(Base):
 
 		body = censor_slurs(body, v).replace('<img loading="lazy" data-bs-toggle="tooltip" alt=":marseytrain:" title=":marseytrain:" src="/e/marseytrain.webp">', ':marseytrain:')
 
+		if v:
+			body = body.replace("!YOU!", v.username)
+
 		return body
 
 	@lazy
diff --git a/files/classes/submission.py b/files/classes/submission.py
index 4383629d7..526f8112f 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -324,6 +324,9 @@ class Submission(Base):
 		if not listing and not self.ghost and self.author.show_sig(v):
 			body += f"<hr>{self.author.sig_html}"
 
+		if v:
+			body = body.replace("!YOU!", v.username)
+
 		return body
 
 	@lazy
@@ -337,6 +340,10 @@ class Submission(Base):
 
 		body = censor_slurs(body, v).replace('<img loading="lazy" data-bs-toggle="tooltip" alt=":marseytrain:" title=":marseytrain:" src="/e/marseytrain.webp">', ':marseytrain:')
 		body = normalize_urls_runtime(body, v)
+
+		if v:
+			body = body.replace("!YOU!", v.username)
+
 		return body
 
 	@lazy