diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b161c515f..f90cdce33 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -96,7 +96,13 @@ module ApplicationHelper
   end
 
   def person_image_tag(person)
-    image_tag image_or_default(person), :class => "avatar", :alt => person.real_name, :title => person.real_name, "data-person_id" => person.id
+    "<img alt='#{person.real_name}' class='avatar' data-person_id='#{person.id}' src='#{image_or_default(person)}' title='#{person.real_name}'>".html_safe
+  end
+
+  def person_link(person)
+"<a href='/people/#{person.id}'>
+  #{person.real_name}
+</a>".html_safe
   end
 
   def image_or_default(person)
@@ -114,7 +120,9 @@ module ApplicationHelper
     if opts[:to] == :photos
       link_to person_image_tag(person), person_photos_path(person)
     else
-      link_to person_image_tag(person), person_path(person)
+"<a href='/people/#{person.id}'>
+  #{person_image_tag(person)}
+</a>".html_safe
     end
   end
 
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 719b8c22d..4ebf4d455 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -4,11 +4,10 @@
 - comment = hash[:comment]
 - person = hash[:person]
 %li.comment{:data=>{:guid=>comment.id}}
-  %a{:href => "/people/#{person.id}"}
-    %img{:src => image_or_default(person), :class => "avatar", :alt => person.real_name, :title => person.real_name, "data-person_id" => person.id}
+  =person_image_link(person)
   .content
     .from
-      %a{:href => "/people/#{person.id}"}=person.real_name
+      =person_link(person)
     = markdownify(comment.text, :youtube_maps => comment[:youtube_titles])
     %div.time
       = comment.created_at ? "#{time_ago_in_words(comment.created_at)} #{t('ago')}" : time_ago_in_words(Time.now)
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 2487c54ae..f5bf3afc6 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -3,12 +3,10 @@
 -#   the COPYRIGHT file.
 
 %li.message{:data=>{:guid=>post.id}}
-  %a{:href => "/people/#{person.id}"}
-    %img{:src => image_or_default(person), :class => "avatar", :alt => person.real_name, :title => person.real_name, "data-person_id" => person.id}
-
+  =person_image_link(person)
   .content
     .from
-      %a{:href => "/people/#{person.id}"}=person.real_name
+      =person_link(person)
 
       - if person.owner_id == current_user.id
         .aspect
@@ -22,7 +20,7 @@
         .right
           - reshare_aspects = aspects_without_post(aspects, post)
           - unless reshare_aspects.empty?
-            = render 'shared/reshare', :current_user => current_user, :aspects => reshare_aspects, :post => post
+            = render 'shared/reshare', :aspects => reshare_aspects, :post => post
           = link_to t('delete'), status_message_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete"
 
     = render 'status_messages/status_message', :post => post, :photos => photos