diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py
index 1a08b613d..3fff33cf5 100644
--- a/files/helpers/alerts.py
+++ b/files/helpers/alerts.py
@@ -147,7 +147,7 @@ def send_unblock_notif(vid, user, text):
 
 def send_pm(vid, user, text):
 
-	text_html = mistletoe.Document(text)
+	text_html = Renderer().render(mistletoe.Document(text))
 
 	text_html = sanitize(text_html, True)
 
@@ -172,7 +172,7 @@ def send_admin(vid, text):
 
 	text = text.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n")
 
-	text_html = mistletoe.Document(text)
+	text_html = Renderer().render(mistletoe.Document(text))
 
 	text_html = sanitize(text_html, True)
 
diff --git a/files/helpers/markdown.py b/files/helpers/markdown.py
index 8930ac8f4..8156f7d07 100644
--- a/files/helpers/markdown.py
+++ b/files/helpers/markdown.py
@@ -94,6 +94,29 @@ class CustomRenderer(HTMLRenderer):
 		target = token.target[1]
 		return f'{space}<a href="https://old.reddit.com/r/{target}" rel="nofollow noopener noreferrer" class="d-inline-block">r/{target}</a>'
 		
+	def render_redditor_mention(self, token):
+		space = token.target[0]
+		target = token.target[1]
+		return f'{space}<a href="https://old.reddit.com/u/{target}" rel="nofollow noopener noreferrer" class="d-inline-block">u/{target}</a>'
+
+
+class Renderer(HTMLRenderer):
+
+	def __init__(self, **kwargs):
+		super().__init__(SubMention,
+						 RedditorMention,
+						 SubMention2,
+						 RedditorMention2,
+						 )
+
+		for i in kwargs:
+			self.__dict__[i] = kwargs[i]
+
+	def render_sub_mention(self, token):
+		space = token.target[0]
+		target = token.target[1]
+		return f'{space}<a href="https://old.reddit.com/r/{target}" rel="nofollow noopener noreferrer" class="d-inline-block">r/{target}</a>'
+		
 	def render_redditor_mention(self, token):
 		space = token.target[0]
 		target = token.target[1]
diff --git a/files/routes/users.py b/files/routes/users.py
index 9e8999b26..d1a549cb1 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -256,7 +256,7 @@ def messagereply(v):
 		if existing.parent_comment_id: return redirect(f'/notifications?messages=true#comment-{existing.parent_comment_id}')
 		else: return redirect(f'/notifications?messages=true#comment-{existing.id}')
 
-	text_html = mistletoe.Document(message)
+	text_html = Renderer().render(mistletoe.Document(message))
 	text_html = sanitize(text_html, True)
 	new_comment = Comment(author_id=v.id,
 							parent_submission=None,