diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
index e2f15d109..260e9d2f9 100644
--- a/app/views/activities/index.html.erb
+++ b/app/views/activities/index.html.erb
@@ -1,4 +1,4 @@
-
<%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)) %>
+<%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %>
<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb
index 934b01785..3457d4068 100644
--- a/test/functional/activities_controller_test.rb
+++ b/test/functional/activities_controller_test.rb
@@ -78,6 +78,8 @@ class ActivitiesControllerTest < ActionController::TestCase
assert_template 'index'
assert_not_nil assigns(:events_by_day)
+ assert_select 'h2 a[href=/users/2]', :text => 'John Smith'
+
assert_tag :tag => "h3",
:content => /#{3.day.ago.to_date.day}/,
:sibling => { :tag => "dl",