diff --git a/app/contexts/projects/create_context.rb b/app/contexts/projects/create_context.rb
index 64c2785302d..4eb4d2cb251 100644
--- a/app/contexts/projects/create_context.rb
+++ b/app/contexts/projects/create_context.rb
@@ -46,11 +46,14 @@ module Projects
       @project.creator = current_user
 
       if @project.save
-        unless @project.group
-          @project.users_projects.create(project_access: UsersProject::MASTER, user: current_user)
-        end
-
         @project.discover_default_branch
+
+        unless @project.group
+          @project.users_projects.create(
+            project_access: UsersProject::MASTER,
+            user: current_user
+          )
+        end
       end
 
       @project
diff --git a/app/models/project.rb b/app/models/project.rb
index 5ffbead5555..096b65587c9 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -89,7 +89,7 @@ class Project < ActiveRecord::Base
     format: { with: URI::regexp(%w(git http https)), message: "should be a valid url" },
     if: :import?
 
-  validate :check_limit
+  validate :check_limit, on: :create
 
   # Scopes
   scope :without_user, ->(user)  { where("projects.id NOT IN (:ids)", ids: user.authorized_projects.map(&:id) ) }