diff --git a/app/views/projects/git/base/_choose_fork.html.haml b/app/views/projects/git/base/_choose_fork.html.haml
index 8bffb0d33..4288bf9a8 100644
--- a/app/views/projects/git/base/_choose_fork.html.haml
+++ b/app/views/projects/git/base/_choose_fork.html.haml
@@ -1,8 +1,8 @@
-- if owner.projects.exists? :name => @project.name
+- if owner.own_projects.exists? :name => @project.name
   - is_group = owner.class == Group ? "(#{t 'activerecord.models.group'})" : ''
   %p.center
     =t 'layout.projects.already_exists'
-    =link_to "#{owner.uname}/#{@project.name} #{is_group}", project_path(owner.projects.by_name(@project.name).first)
+    =link_to "#{owner.uname}/#{@project.name} #{is_group}", project_path(owner, @project.name)
 - else
   = form_for @project, :url => fork_project_path(@project), :html => { :class => :form, :multipart => true, :method => :post } do |f|
     = hidden_field_tag :group, owner.id if owner.class == Group