diff --git a/app/jobs/regenerate_registrar_whoises_job.rb b/app/jobs/regenerate_registrar_whoises_job.rb
index 10e13a038..68a76c8d3 100644
--- a/app/jobs/regenerate_registrar_whoises_job.rb
+++ b/app/jobs/regenerate_registrar_whoises_job.rb
@@ -4,7 +4,7 @@ class RegenerateRegistrarWhoisesJob < Que::Job
     registrar = Registrar.find(registrar_id)
 
     registrar.whois_records.select(:id).find_in_batches(batch_size: 20) do |group|
-      RegenerateWhoisRecordJob.enqueue group.map(&:id)
+      RegenerateWhoisRecordJob.enqueue group.map(&:id), :id
     end
   end
 end
\ No newline at end of file
diff --git a/app/jobs/regenerate_whois_record_job.rb b/app/jobs/regenerate_whois_record_job.rb
index 6d79e2ea5..051247b7f 100644
--- a/app/jobs/regenerate_whois_record_job.rb
+++ b/app/jobs/regenerate_whois_record_job.rb
@@ -1,7 +1,7 @@
 class RegenerateWhoisRecordJob < Que::Job
-  def run(ids)
+  def run(ids, attr = :id)
     ids.each do |id|
-      record = WhoisRecord.find_by(id: id)
+      record = WhoisRecord.find_by(attr => id)
       return unless record
 
       record.save
diff --git a/app/models/contact.rb b/app/models/contact.rb
index ccc44851d..39672e2c4 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -498,7 +498,7 @@ class Contact < ActiveRecord::Base
   end
 
  def update_related_whois_records
-   related_domain_descriptions.each{ |x, y| WhoisRecord.find_by(name: x).try(:save) }
+   RegenerateWhoisRecordJob.enqueue related_domain_descriptions.keys, :name
  end	 
 
 end