diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b6e4c4389..89df26155 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -57,11 +57,7 @@ module ApplicationHelper
   end
 
   def person_image_link(person)
-    if current_user.friends.include?(person) || current_user.person == person
-      link_to person_image_tag(person), object_path(person)
-    else
-      person_image_tag person
-    end
+    link_to person_image_tag(person), object_path(person)
   end
 
   def new_request(request_count)
diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml
index 185695db1..7e22a5570 100644
--- a/app/views/people/_person.html.haml
+++ b/app/views/people/_person.html.haml
@@ -8,10 +8,7 @@
 
   .content
     %span.from
-      - if current_user.friends.include?(person) || person.id == current_user.person.id
-        = link_to person.real_name, person_path(person)
-      - else
-        = person.real_name
+      = link_to person.real_name, person_path(person)
 
     .info
       = person.diaspora_handle