diff --git a/app/views/user_notifications/mailing_list.html.erb b/app/views/user_notifications/mailing_list.html.erb
index 749ee60867e..582f7c66b3d 100644
--- a/app/views/user_notifications/mailing_list.html.erb
+++ b/app/views/user_notifications/mailing_list.html.erb
@@ -56,7 +56,16 @@
           <div>
             <img style="float: left; width: 20px; padding-right: 5px;" src="<%= post.user.small_avatar_url %>" title="<%= post.user.username%>">
             <p style="font-size: 15px; color: #888">
-              <a href='<%= [Discourse.base_url, :users, post.user.username].join('/') %>'><%= post.user.name || post.user.username %></a>
+              <a href='<%= "#{Discourse.base_url}/users/#{post.user.username}" %>'>
+                <%- if show_username_on_post(post) %>
+                  <%= post.user.username %>
+                <% end %>
+
+                <%- if show_name_on_post(post) %>
+                  - <%= post.user.name %>
+                <% end %>
+              </a>
+
               <span> - </span>
               <span><%= I18n.l(post.created_at, format: :long) %></span>
             </p>