diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5995187d7..064c13190 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -48,7 +48,7 @@ module ApplicationHelper
 
   # Display a link to user's account page
   def link_to_user(user)
-    user ? link_to(user, :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
+    (user && !user.anonymous?) ? link_to(user, :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
   end
 
   def link_to_issue(issue, options={})
diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml
index 2b30dadc5..13414fd84 100644
--- a/app/views/issues/_history.rhtml
+++ b/app/views/issues/_history.rhtml
@@ -3,7 +3,7 @@
   <div id="change-<%= journal.id %>" class="journal">
     <h4><div style="float:right;"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
     <%= content_tag('a', '', :name => "note-#{journal.indice}")%>
-    <%= format_time(journal.created_on) %> - <%= journal.user.name %></h4>
+    <%= format_time(journal.created_on) %> - <%= link_to_user(journal.user) %></h4>
     <%= avatar(journal.user, :size => "32") %>
     <ul>
     <% for detail in journal.details %>