diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 936e9ce64..3a33d7c71 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -52,7 +52,7 @@ module ApplicationHelper
     opts[:class] ||= ""
     opts[:class] << " self" if defined?(user_signed_in?) && user_signed_in? && current_user.person == person
     if person.local?
-          "<a href='#{person.diaspora_handle.split('@')[0]}' class='#{opts[:class]}'>
+          "<a href=/u/'#{person.diaspora_handle.split('@')[0]}' class='#{opts[:class]}'>
         #{h(person.name)}
       </a>".html_safe
     else
@@ -72,7 +72,7 @@ module ApplicationHelper
       link_to person_image_tag(person, opts[:size]), person_photos_path(person)
     else
       if person.local?
-        "<a href='#{person.diaspora_handle.split('@')[0]}' class='#{opts[:class]}'>
+        "<a href='/u/#{person.diaspora_handle.split('@')[0]}' class='#{opts[:class]}'>
         #{person_image_tag(person)}
         </a>".html_safe
       else
diff --git a/config/routes.rb b/config/routes.rb
index d1f8260cf..6080af18e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -154,7 +154,7 @@ Diaspora::Application.routes.draw do
 
   get 'mobile/toggle', :to => 'home#toggle_mobile', :as => 'toggle_mobile'
 
-  get ':username' => 'people#show', :as => 'user_profile'
+  get '/u/:username' => 'people#show', :as => 'user_profile'
   # Startpage
 
   root :to => 'home#show'