diff --git a/app/models/environment.rb b/app/models/environment.rb
index 321551d..f96766f 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -282,7 +282,10 @@ class Environment < ActiveRecord::Base
   settings_items :activation_blocked_text, :type => String
   settings_items :message_for_disabled_enterprise, :type => String,
                  :default => _('This enterprise needs to be enabled.')
+
   settings_items :location, :type => String
+  settings_items :country_name, :type => String
+
   settings_items :layout_template, :type => String, :default => 'default'
   settings_items :homepage, :type => String
   settings_items :description, :type => String, :default => '<div style="text-align: center"><a href="http://noosfero.org/"><img src="/images/noosfero-network.png" alt="Noosfero"/></a></div>'
diff --git a/plugins/metadata/lib/ext/enterprise.rb b/plugins/metadata/lib/ext/enterprise.rb
index eaa48a7..345ed30 100644
--- a/plugins/metadata/lib/ext/enterprise.rb
+++ b/plugins/metadata/lib/ext/enterprise.rb
@@ -9,12 +9,13 @@ class Enterprise
 
   metadata_spec namespace: 'business:contact_data', tags: {
     email: proc{ |e, plugin| e.contact_email },
-	  phone_number: proc{ |e, plugin| e.contact_phone },
-	  street_address: proc{ |e, plugin| e.address },
-	  locality: proc{ |e, plugin| e.city },
-	  region: proc{ |e, plugin| e.state },
-	  postal_code: proc{ |e, plugin| e.zip_code },
-	  country_name: proc{ |e, plugin| e.country },
+    phone_number: proc{ |e, plugin| e.contact_phone },
+    street_address: proc{ |e, plugin| e.address },
+    locality: proc{ |e, plugin| e.city },
+    region: proc{ |e, plugin| e.state },
+    postal_code: proc{ |e, plugin| e.zip_code },
+    # required
+    country_name: proc{ |e, plugin| e.country || e.environment.country_name || 'Unknown' },
   }
 
 end
--
libgit2 0.21.2