diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index d7736f79c..c5a712dbc 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -190,8 +190,8 @@ namespace :import do
           name,
           x.organization.try(:strip),
           x.object_registry.try(:registrar).try(:id),
-          user,
-          x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
+          x.object_registry.try(:registrar).try(:name),
+          x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
           x.country.try(:strip),
           x.id,
           [x.street1.try(:strip), x.street2.try(:strip), x.street3.try(:strip)].join("\n"),
@@ -321,8 +321,8 @@ namespace :import do
           SimpleIDN.to_ascii(x.object_registry.name.try(:strip)),
           1,
           'y',
-          user,
-          x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
+          x.object_registry.try(:registrar).try(:name),
+          x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
           x.id,
           x.object_registry.try(:crid),
           x.registrant,
@@ -333,8 +333,8 @@ namespace :import do
         x.domain_contact_maps.each do |dc|
           domain_contacts << [
             'AdminDomainContact',
-            user,
-            x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
+            x.object_registry.try(:registrar).try(:name),
+            x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
             x.id,
             dc.contactid
           ]
@@ -344,8 +344,8 @@ namespace :import do
         x.nsset_contact_maps.each do |dc|
           domain_contacts << [
             'TechDomainContact',
-            user,
-            x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
+            x.object_registry.try(:registrar).try(:name),
+            x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
             x.id,
             dc.contactid
           ]
@@ -365,8 +365,8 @@ namespace :import do
             host.fqdn.try(:strip),
             ips[:ipv4].try(:strip),
             ips[:ipv6].try(:strip),
-            user,
-            x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
+            x.object_registry.try(:registrar).try(:name),
+            x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
             x.id
           ]
         end if x.nsset && x.nsset.hosts
@@ -379,8 +379,8 @@ namespace :import do
             key.key,
             3, # ds_alg
             1, # ds_digest_type /SHA1)
-            user,
-            x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
+            x.object_registry.try(:registrar).try(:name),
+            x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid),
             x.id
           ]
         end