diff --git a/app/controllers/ci/base_controller.rb b/app/controllers/ci/base_controller.rb
index 2286804f..aeabb0d3 100644
--- a/app/controllers/ci/base_controller.rb
+++ b/app/controllers/ci/base_controller.rb
@@ -2,7 +2,7 @@ class Ci::BaseController < ApplicationController
   include Ci::DbConnectable
 
   before_action :require_login
-  before_action :connect_to_ci_database, if: -> { current_user && !current_user.is_a?(AnonymousUser) && current_user.devops_unverified? }
+  before_action :connect_to_ci_database, if: -> { current_user && !current_user.is_a?(AnonymousUser) && current_user.devops_certification? }
 
   def load_repo
     namespace = params[:owner]
diff --git a/app/controllers/concerns/ci/cloud_account_manageable.rb b/app/controllers/concerns/ci/cloud_account_manageable.rb
index 7faf9137..a3418f71 100644
--- a/app/controllers/concerns/ci/cloud_account_manageable.rb
+++ b/app/controllers/concerns/ci/cloud_account_manageable.rb
@@ -58,7 +58,7 @@ module Ci::CloudAccountManageable
 
     if current_user.devops_step == User::DEVOPS_UNINIT || cloud_account.blank?
       return render_error('你未绑定CI服务器')
-    elsif current_user.devops_step != User::DEVOPS_UNINIT || current_user.ci_certification?
+    elsif current_user.ci_certification?
       cloud_account.destroy!
       # TOTO drop drone database
       @connection.execute("DROP DATABASE IF EXISTS #{current_user.login}_drone")
diff --git a/app/models/concerns/droneable.rb b/app/models/concerns/droneable.rb
index c1f8b339..87013e2b 100644
--- a/app/models/concerns/droneable.rb
+++ b/app/models/concerns/droneable.rb
@@ -12,6 +12,10 @@ module Droneable
     self.devops_step === User::DEVOPS_UNVERIFIED
   end
 
+  def devops_certification?
+    self.devops_step === User::DEVOPS_CERTIFICATION
+  end
+
   def set_drone_step!(step)
     self.update_column(:devops_step, step)
   end