diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 75a13dc6b..65f1c8679 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -43,11 +43,11 @@ module ApplicationHelper
   end
 
   def owner_image_tag
-    person_image_tag(current_user)
+    person_image_tag(current_user.person)
   end
 
   def owner_image_link
-    person_image_link(current_user)
+    person_image_link(current_user.person)
   end
 
   def person_image_tag(person)
diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml
index 646d0b333..e0c77d990 100644
--- a/app/views/people/_person.html.haml
+++ b/app/views/people/_person.html.haml
@@ -8,7 +8,7 @@
 
   .content
     %span.from
-      = link_to person.real_name, person
+      = link_to person.real_name, person_path(person)
 
     .info
       = person.diaspora_handle