diff --git a/db/migrate/20151124200353_add_ident_autofill.rb b/db/migrate/20151124200353_add_ident_autofill.rb
new file mode 100644
index 000000000..429b2b256
--- /dev/null
+++ b/db/migrate/20151124200353_add_ident_autofill.rb
@@ -0,0 +1,95 @@
+class AddIdentAutofill < ActiveRecord::Migration
+  def change
+    execute "
+    CREATE OR REPLACE FUNCTION fill_ident_country()
+      RETURNS BOOLEAN AS $$
+      DECLARE
+        changed     BOOLEAN;
+        multiplier  INT [];
+        multiplier2 INT [];
+        multiplier3 INT [];
+        multiplier4 INT [];
+        r           RECORD;
+        control     TEXT;
+        total       INT;
+        i           INT;
+        mod         INT;
+        counter     INT;
+      BEGIN
+
+        multiplier  := ARRAY [1, 2, 3, 4, 5, 6, 7, 8, 9, 1];
+        multiplier2 := ARRAY [3, 4, 5, 6, 7, 8, 9, 1, 2, 3];
+        multiplier3 := ARRAY [1, 2, 3, 4, 5, 6, 7];
+        multiplier4 := ARRAY [3, 4, 5, 6, 7, 8, 9];
+
+        FOR r IN SELECT id, ident FROM contacts WHERE ident_type = 'priv' AND ident_country_code IS NULL
+        LOOP
+          IF (length(r.ident) = 11 AND (r.ident ~ '^[0-9]+$') AND (substring(r.ident, 1, 1) = '3' OR substring(r.ident, 1, 1) = '4' OR substring(r.ident, 1, 1) = '5' OR substring(r.ident, 1, 1) = '6'))
+          THEN
+            total := 0;
+            counter := 1;
+            FOREACH i IN ARRAY multiplier
+            LOOP
+              total := (total + (i * to_number(substring(r.ident, counter, 1), '9')));
+              counter := (counter + 1);
+            END LOOP;
+            mod := (total % 11);
+            counter := 1;
+            IF (mod >= 10)
+            THEN
+              total = 0;
+              FOREACH i IN ARRAY multiplier2
+              LOOP
+                total := (total + (i *  to_number(substring(r.ident, counter, 1), '9')));
+                counter := (counter + 1);
+              END LOOP;
+              mod := (total % 11);
+            END IF;
+
+            IF (mod < 10 AND substring(r.ident, 11, 1) = to_char(mod, 'FM999MI'))
+              THEN
+                UPDATE contacts SET ident_country_code = 'EE' WHERE id = r.id;
+            END IF;
+            total = 0;
+          END IF;
+        END LOOP;
+
+        FOR r IN SELECT id, ident FROM contacts WHERE ident_type = 'org' AND ident_country_code IS NULL
+        LOOP
+          IF (length(r.ident) = 8 AND (r.ident ~ '^[0-9]+$') AND (substring(r.ident, 1, 1) = '1' OR substring(r.ident, 1, 1) = '8' OR substring(r.ident, 1, 1) = '9'))
+          THEN
+            total := 0;
+            counter := 1;
+            FOREACH i IN ARRAY multiplier3
+            LOOP
+              total := (total + (i * to_number(substring(r.ident, counter, 1), '9')));
+              counter := (counter + 1);
+            END LOOP;
+            mod := total % 11;
+            total = 0;
+            counter := 1;
+            IF (mod >= 10)
+            THEN
+              total = 0;
+              FOREACH i IN ARRAY multiplier4
+              LOOP
+                total := (total + (i *  to_number(substring(r.ident, counter, 1), '9')));
+                counter := (counter + 1);
+              END LOOP;
+              mod := (total % 11);
+            END IF;
+            IF (mod < 10 AND (substring(r.ident, 8, 1) = to_char(mod, 'FM999MI')))
+            THEN
+              UPDATE contacts SET ident_country_code = 'EE' WHERE id = r.id;
+            END IF;
+          END IF;
+        END LOOP;
+      RETURN changed;
+      END;
+      $$  LANGUAGE plpgsql;"
+  end
+
+  def down
+    execute "DROP FUNCTION IF EXISTS fill_ident_country()"
+  end
+end
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index 6e6e0664e..18857a7f8 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -226,7 +226,6 @@ namespace :import do
       registrar_id
       creator_str
       updator_str
-      ident_country_code
       legacy_id
       street
       city
@@ -262,7 +261,6 @@ namespace :import do
           Registrar.find_by(legacy_id: x.object.try(:clid)).try(:id),
           x.object_registry.try(:registrar).try(:name),
           x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
-          x.country.try(:strip),
           x.id,
           [x.street1.try(:strip), x.street2.try(:strip), x.street3.try(:strip)].join("\n"),
           x.city.try(:strip),