diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index 27dd50e4..42bd6aeb 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -47,9 +47,8 @@ class Admin::ProjectsController < AdminController
 
   def project
     id = params[:project_id] || params[:id]
-    id = id.split("/") if id.include?("/")
 
-    @project ||= Project.find_by_path(id)
+    @project = Project.find_with_namespace(id)
     @project || render_404
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 5559f847..4f749699 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -72,7 +72,6 @@ class User < ActiveRecord::Base
   alias_attribute :private_token, :authentication_token
 
   delegate :path, to: :namespace, allow_nil: true, prefix: true
-  delegate :id, to: :namespace, allow_nil: true, prefix: true
 
   # Scopes
   scope :not_in_project, ->(project) { where("id not in (:ids)", ids: project.users.map(&:id) ) }