diff --git a/app/models/project.rb b/app/models/project.rb
index 9c77685f7..edaa00eb5 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -141,7 +141,7 @@ class Project < ApplicationRecord
   delegate :content, to: :project_detail, allow_nil: true
   delegate :name, to: :license, prefix: true, allow_nil: true
 
-  validate :validate_sensitive_string
+  validate :validate_sensitive_string, on: [:create, :update]
 
   def self.all_visible(user_id=nil)
     user_projects_sql = Project.joins(:owner).where(users: {type: 'User'}).to_sql
diff --git a/app/models/project_unit.rb b/app/models/project_unit.rb
index cc35a6b28..01f6c6670 100644
--- a/app/models/project_unit.rb
+++ b/app/models/project_unit.rb
@@ -14,6 +14,8 @@
 #
 
 class ProjectUnit < ApplicationRecord
+
+  default_scope {where(unit_type: ProjectUnit.unit_types.keys)}
   belongs_to :project
 
   enum unit_type: {code: 1, issues: 2, pulls: 3, wiki:4, devops: 5, versions: 6, resources: 7}