diff --git a/lib/institution.rb b/lib/institution.rb
index c8b5cc9..7a22d12 100644
--- a/lib/institution.rb
+++ b/lib/institution.rb
@@ -15,11 +15,13 @@ class Institution < ActiveRecord::Base
   before_save :verify_institution_type
 
   belongs_to :community
-
+  
   scope :search_institution, lambda{ |value|
     where("name ilike ? OR acronym ilike ?", "%#{value}%", "%#{value}%" )
   }
 
+  validate :validate_country, :validate_state, :validate_city 
+
   protected
 
   def verify_institution_type
@@ -30,4 +32,16 @@ class Institution < ActiveRecord::Base
       false
     end
   end
+
+  def validate_country
+    self.errors.add(:country, _("can't be blank")) if self.community.country.blank?  && self.errors[:country].blank?
+  end
+
+  def validate_state
+    self.errors.add(:state, _("can't be blank")) if self.community.state.blank?  && self.errors[:state].blank?
+  end
+
+  def validate_city
+    self.errors.add(:city, _("can't be blank")) if self.community.city.blank?  && self.errors[:city].blank?
+  end
 end
diff --git a/lib/public_institution.rb b/lib/public_institution.rb
index 1964cb1..5a7ee05 100644
--- a/lib/public_institution.rb
+++ b/lib/public_institution.rb
@@ -1,5 +1,7 @@
 class PublicInstitution < Institution
-  validates :acronym, :governmental_power, :governmental_sphere, :presence=>true
+  validates :governmental_power, :governmental_sphere, :juridical_nature, :presence=>true
+  validates_uniqueness_of :acronym, :allow_blank => true, :allow_nil => true
   validates_uniqueness_of :cnpj, :unit_code, :allow_nil => true, :allow_blank => true
   validates_format_of :cnpj, :with => /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/, :allow_nil => true, :allow_blank => true
-end
\ No newline at end of file
+  
+end
--
libgit2 0.21.2