diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb
index 390708e76..93f904cf2 100644
--- a/app/models/domain_cron.rb
+++ b/app/models/domain_cron.rb
@@ -74,11 +74,13 @@ class DomainCron
       d.each do |domain|
         next unless domain.delete_candidateable?
         real += 1
+        domain.statuses << DomainStatus::DELETE_CANDIDATE
         STDOUT << "#{Time.zone.now.utc} DomainCron.start_delete_period: ##{domain.id} (#{domain.name})\n" unless Rails.env.test?
-        DomainSetDeleteCandidateJob.enqueue(domain.id, run_at: rand(((24*60) - (DateTime.now.hour * 60  + DateTime.now.minute))).minutes.from_now) and marked += 1
+        ::PaperTrail.whodunnit = "cron - #{__method__}"
+        domain.save(validate: false) and marked += 1
       end
     ensure # the operator should see what was accomplished
-      STDOUT << "#{Time.zone.now.utc} - Finished setting schedule for delete_candidate -  #{marked} out of #{real} successfully added to Que schedule\n" unless Rails.env.test?
+      STDOUT << "#{Time.zone.now.utc} - Finished setting delete_candidate -  #{marked} out of #{real} successfully set\n" unless Rails.env.test?
     end
     marked
   end
@@ -96,6 +98,7 @@ class DomainCron
     end
 
     Domain.where('force_delete_at <= ?', Time.zone.now).each do |x|
+      WhoisRecord.where(domain_id: x.id).destroy_all
       DomainDeleteJob.enqueue(x.id, run_at: rand(((24*60) - (DateTime.now.hour * 60  + DateTime.now.minute))).minutes.from_now)
       STDOUT << "#{Time.zone.now.utc} DomainCron.destroy_delete_candidates: job added by force delete time ##{x.id} (#{x.name})\n" unless Rails.env.test?
       c += 1