diff --git a/files/templates/submission.html b/files/templates/submission.html
index 1fb37df69..5e103dca5 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -31,9 +31,8 @@
 <meta property="og:type" content="article" />
 
 {% if comment_info and not comment_info.is_banned and not linked_comment.deleted_utc > 0 %}
+
 <title>{{'@'+comment_info.author.username}} comments on "{{title}} - {{"SITE_NAME" | app_config}}"</title>
-
-
 <meta property="og:article:author" content="{{'@'+comment_info.author.username}}" />
 <meta property="article:published_time" content="{{comment_info.created_datetime}}" />
 {% if comment_info.edited_utc %}<meta property="article:modified_time" content="{{comment_info.edited_string}}" />{% endif %}
@@ -57,9 +56,7 @@
 {% endif %}
 
 {% else %}
-<title>{{title | safe}} - {{"SITE_NAME" | app_config}}</title>
-
-
+<title>{{p.title}} - {{"SITE_NAME" | app_config}}</title>
 <meta property="og:article:author" content="{{'@'+p.author.username}}" />
 <meta property="article:published_time" content="{{p.created_iso}}" />
 {% if p.edited_utc %}<meta property="article:modified_time" content="{{p.edited_string}}" />{% endif %}