diff --git a/app/models/domain.rb b/app/models/domain.rb
index 8374a181e..b8d598ad8 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -9,6 +9,7 @@ class Domain < ActiveRecord::Base
   belongs_to :admin_contact, class_name: 'Contact'
 
   validates :name, domain_name: true
+  validates :name_puny, domain_name: true
 
   def name=(value)
     value.strip!
diff --git a/app/validators/domain_name_validator.rb b/app/validators/domain_name_validator.rb
index 93d87c735..1602b3faf 100644
--- a/app/validators/domain_name_validator.rb
+++ b/app/validators/domain_name_validator.rb
@@ -16,19 +16,19 @@ class DomainNameValidator < ActiveModel::EachValidator
     def validate(value)
       value = value.mb_chars.downcase.strip
 
-      general_domains = /(.pri.ee|.edu.ee|.aip.ee|.org.ee|.med.ee|.riik.ee|.ee)/ #TODO Add more general domains here
+      general_domains = /(.pri.ee|.com.ee|.fie.ee|.med.ee|.ee)/ #TODO Add more general domains here
 
       # it's punycode
       if value[2] == '-' && value[3] == '-'
-        regexp = /\Axn--[a-zA-Z0-9-]{0,61}#{general_domains}\z/
+        regexp = /\Axn--[a-zA-Z0-9-]{0,59}#{general_domains}\z/
         return false unless value =~ regexp
-        value = SimpleIDN.to_unicode(value)
+        value = SimpleIDN.to_unicode(value).mb_chars.downcase.strip
       end
 
       unicode_chars = /\u00E4\u00F5\u00F6\u00FC\u0161\u017E/ #äõöüšž
       regexp = /\A[a-zA-Z0-9#{unicode_chars}][a-zA-Z0-9#{unicode_chars}-]{0,61}[a-zA-Z0-9#{unicode_chars}]#{general_domains}\z/
 
-      value =~ regexp
+      !!(value =~ regexp)
     end
 
   end
diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb
index fba26552c..08c077073 100644
--- a/spec/models/domain_spec.rb
+++ b/spec/models/domain_spec.rb
@@ -11,16 +11,28 @@ describe Domain do
     d = Fabricate(:domain)
     expect(d.name).to_not be_nil
 
-    invalid = ['a.ee', "#{'a' * 64}.ee", 'ab.eu', 'test.ab.ee', '-test.ee', '-test-.ee', 'test-.ee', 'te--st.ee', 'õ.pri.ee', 'test.com', 'www.ab.ee', 'test.eu', '  .ee', 'a b.ee', 'Ž .ee']
+    invalid = ['a.ee', "#{'a' * 64}.ee", 'ab.eu', 'test.ab.ee', '-test.ee', '-test-.ee', 'test-.ee', 'te--st.ee', 'õ.pri.ee', 'test.com', 'www.ab.ee', 'test.eu', '  .ee', 'a b.ee', 'Ž .ee', 'test.edu.ee']
 
     invalid.each do |x|
       expect(Fabricate.build(:domain, name: x).valid?).to be false
     end
 
-    valid = ['ab.ee', "#{'a' * 63}.ee", 'te-s-t.ee', 'jäääär.ee', 'päike.pri.ee', 'õigus.edu.ee', 'õäöü.aip.ee', 'test.org.ee', 'test.med.ee', 'test.riik.ee', 'žä.ee', '  ŽŠ.ee  ']
+    valid = ['ab.ee', "#{'a' * 63}.ee", 'te-s-t.ee', 'jäääär.ee', 'päike.pri.ee', 'õigus.com.ee', 'õäöü.fie.ee', 'test.med.ee', 'žä.ee', '  ŽŠ.ee  ']
 
     valid.each do |x|
       expect(Fabricate.build(:domain, name: x).valid?).to be true
     end
+
+    invalid_punycode = ['xn--geaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-4we.pri.ee']
+
+    invalid_punycode.each do |x|
+      expect(Fabricate.build(:domain, name: x).valid?).to be false
+    end
+
+    valid_punycode = ['xn--ge-uia.pri.ee', 'xn--geaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-9te.pri.ee']
+
+    valid_punycode.each do |x|
+      expect(Fabricate.build(:domain, name: x).valid?).to be true
+    end
   end
 end