diff --git a/app/views/list/list.rss.erb b/app/views/list/list.rss.erb
index deb5e80f022..b1eb41f1038 100644
--- a/app/views/list/list.rss.erb
+++ b/app/views/list/list.rss.erb
@@ -1,5 +1,5 @@
-
+
<% lang = SiteSetting.find_by_name('default_locale').try(:value) %>
<% site_email = SiteSetting.find_by_name('contact_email').try(:value) %>
@@ -14,7 +14,7 @@
<% topic_url = topic.url -%>
-
<%= topic.title %>
- <%= "no-reply@example.com (@#{topic.user.username}#{" #{topic.user.name}" if (topic.user.name.present? && SiteSetting.enable_names?)})" -%>
+ ]]>
<%= topic.category.name %>
<%= t('author_wrote', author: link_to("@#{topic.user.username}", "#{Discourse.base_url}/users/#{topic.user.username_lower}")).html_safe %>
diff --git a/app/views/posts/latest.rss.erb b/app/views/posts/latest.rss.erb
index 04aeb027870..7cfb0a8e1d2 100644
--- a/app/views/posts/latest.rss.erb
+++ b/app/views/posts/latest.rss.erb
@@ -1,5 +1,5 @@
-
+
<% lang = SiteSetting.find_by_name('default_locale').try(:value) %>
<% site_email = SiteSetting.find_by_name('contact_email').try(:value) %>
@@ -10,7 +10,7 @@
<% next unless post.user %>
-
<%= post.topic.title %>
- <%= "no-reply@example.com (@#{post.user.username}#{" #{post.user.name}" if (post.user.name.present? && SiteSetting.enable_names?)})" -%>
+ ]]>
]]>
<%= Discourse.base_url + post.url %>
<%= post.created_at.rfc2822 %>
diff --git a/app/views/topics/show.rss.erb b/app/views/topics/show.rss.erb
index 03b5471ecbc..e49890e2d02 100644
--- a/app/views/topics/show.rss.erb
+++ b/app/views/topics/show.rss.erb
@@ -1,5 +1,5 @@
-
+
<% topic_url = @topic_view.absolute_url %>
<% lang = SiteSetting.find_by_name('default_locale').try(:value) %>
@@ -15,7 +15,7 @@
<% next unless post.user %>
-
<%= @topic_view.title %>
- <%= "no-reply@example.com (@#{post.user.username}#{" #{post.user.name}" if (post.user.name.present? && SiteSetting.enable_names?)})" -%>
+ ]]>
<%= t('author_wrote', author: link_to("@#{post.user.username}", user_url(post.user.username_lower))).html_safe %>