diff --git a/app/controllers/my_profile/maps_controller.rb b/app/controllers/my_profile/maps_controller.rb
index a8ac94a..1d8b5d2 100644
--- a/app/controllers/my_profile/maps_controller.rb
+++ b/app/controllers/my_profile/maps_controller.rb
@@ -31,23 +31,11 @@ class MapsController < MyProfileController
   end
 
   def search_city
-
-    term = params[:term];
-
-    regions = NationalRegion.search_city(term + "%", true).map {|r|{ :label => r.city , :category => r.state}}
-
-    render :json => regions
-
+    render :json => MapsHelper.search_city(params[:term])
   end
 
   def search_state
-
-    term = params[:term];
-
-    regions = NationalRegion.search_state(term + "%", true).map {|r|{ :label => r.state}}
-
-    render :json => regions
-
+    render :json => MapsHelper.search_state(params[:term])
   end
 
 end
diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb
index 4a64230..73171a0 100644
--- a/app/controllers/public/account_controller.rb
+++ b/app/controllers/public/account_controller.rb
@@ -291,6 +291,23 @@ class AccountController < ApplicationController
     render :text => user_data.to_json, :layout => false, :content_type => "application/javascript"
   end
 
+  def search_cities
+    if request.xhr? and params[:state_name] and params[:city_name]
+      render :json => MapsHelper.search_city(params[:city_name], params[:state_name])
+    else
+      render :json => [].to_json
+    end
+  end
+
+  def search_state
+    if request.xhr? and params[:state_name]
+      render :json => MapsHelper.search_state(params[:state_name])
+    else
+      render :json => [].to_json
+    end
+  end
+
+
   protected
 
   def redirect?
diff --git a/app/helpers/maps_helper.rb b/app/helpers/maps_helper.rb
new file mode 100644
index 0000000..93d9387
--- /dev/null
+++ b/app/helpers/maps_helper.rb
@@ -0,0 +1,14 @@
+module MapsHelper
+  def self.search_city term, state=""
+    cities = if state.empty?
+      NationalRegion.search_city(term + "%", true)
+    else
+      NationalRegion.search_city(term + "%", true, state)
+    end
+    cities.map {|r|{ :label => r.city , :category => r.state}}
+  end
+
+  def self.search_state term
+    NationalRegion.search_state(term + "%", true).map {|r|{ :label => r.state}}
+  end
+end
diff --git a/app/models/national_region.rb b/app/models/national_region.rb
index e06e4ba..6990986 100644
--- a/app/models/national_region.rb
+++ b/app/models/national_region.rb
@@ -12,7 +12,7 @@ class NationalRegion < ActiveRecord::Base
     adtional_contions = "";
 
     if like
-     operator  = "like"
+     operator  = "ilike"
      find_return = :all
     end
 
@@ -41,7 +41,7 @@ class NationalRegion < ActiveRecord::Base
     find_return = :first
 
     if like
-     operator  = "like"
+     operator  = "ilike"
      find_return = :all
     end
 
diff --git a/app/views/profile_editor/_person_form.rhtml b/app/views/profile_editor/_person_form.rhtml
index 336ae7a..4c8a2f8 100644
--- a/app/views/profile_editor/_person_form.rhtml
+++ b/app/views/profile_editor/_person_form.rhtml
@@ -19,8 +19,8 @@
 <%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), '<div class="select-birth-date">' + pick_date(:profile_data, :birth_date, {:start_year => (Date.today.year - 100), :end_year => (Date.today.year - 5)}) + '</div>')) %>
 <%= optional_field(@person, 'nationality', f.text_field(:nationality, :rel => _('Nationality'))) %>
 <%= optional_field(@person, 'country', select_country(_('Country'), 'profile_data', 'country', {:class => 'type-select'})) %>
-<%= optional_field(@person, 'state', f.text_field(:state, :rel => _('State'))) %>
-<%= optional_field(@person, 'city', f.text_field(:city, :rel => _('City'))) %>
+<%= optional_field(@person, 'state', f.text_field(:state, :id => 'state_field', :rel => _('State'))) %>
+<%= optional_field(@person, 'city', f.text_field(:city, :id => 'city_field', :rel => _('City'))) %>
 <%= optional_field(@person, 'zip_code', labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code, :rel => _('ZIP code')))) %>
 <%= optional_field(@person, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address, :rel => _('Address')))) %>
 <%= optional_field(@person, 'address_reference', labelled_form_field(_('Address reference'), text_field(:profile_data, :address_reference, :rel => _('Address reference')))) %>
@@ -36,6 +36,7 @@
   </div>
 <% end %>
 
+<%= javascript_include_tag('city_state_validation') %>
 <script type='text/javascript'>
   function toggle_text_field(id, span_id) {
     if ($(id).value == "Others") {
diff --git a/app/views/shared/_organization_custom_fields.rhtml b/app/views/shared/_organization_custom_fields.rhtml
index 508db10..5b19eb8 100644
--- a/app/views/shared/_organization_custom_fields.rhtml
+++ b/app/views/shared/_organization_custom_fields.rhtml
@@ -13,8 +13,8 @@
 <%= optional_field(profile, 'address_reference', labelled_form_field(_('Address reference'), text_field(object_name, :address_reference))) %>
 <%= optional_field(profile, 'district', labelled_form_field(_('District'), text_field(object_name, :district))) %>
 <%= optional_field(profile, 'zip_code', labelled_form_field(_('ZIP code'), text_field(object_name, :zip_code))) %>
-<%= optional_field(profile, 'city', f.text_field(:city)) %>
-<%= optional_field(profile, 'state', f.text_field(:state)) %>
+<%= optional_field(profile, 'city', f.text_field(:city, :id =>'city_field')) %>
+<%= optional_field(profile, 'state', f.text_field(:state,:id =>'state_field')) %>
 <%= optional_field(profile, 'country', select_country(_('Country'), object_name, 'country', {:class => 'type-select'})) %>
 <%= optional_field(profile, 'tag_list', f.text_field(:tag_list)) %>
 
@@ -29,3 +29,4 @@
   <%= optional_field(profile, 'acronym', f.text_field(:acronym)) %>
   <%= optional_field(profile, 'foundation_year', f.text_field(:foundation_year)) %>
 <% end %>
+<%= javascript_include_tag('city_state_validation') %>
diff --git a/public/javascripts/city_state_validation.js b/public/javascripts/city_state_validation.js
new file mode 100644
index 0000000..29c96b0
--- /dev/null
+++ b/public/javascripts/city_state_validation.js
@@ -0,0 +1,55 @@
+(function($){
+  $('[id$="_country"]').change(function(){
+    var country_selected = $('[id$="_country"] option:selected').val()
+    if(country_selected == "BR")
+    {
+      $('#state_field').autocomplete({
+        source : function(request, response){
+          $.ajax({
+            type: "GET",
+            url: '/account/search_state',
+            data: {state_name: request.term},
+            success: function(result){
+              response(result);
+            },
+            error: function(ajax, stat, errorThrown) {
+              console.log('Link not found : ' + errorThrown);
+            }
+         });
+        },
+
+        minLength: 3
+      });
+
+      $('#city_field').autocomplete({
+        source : function(request, response){
+          $.ajax({
+            type: "GET",
+            url: '/account/search_cities',
+            data: {city_name: request.term, state_name: $("#state_field").val()},
+            success: function(result){
+              response(result);
+            },
+            error: function(ajax, stat, errorThrown) {
+              console.log('Link not found : ' + errorThrown);
+            }
+          });
+        },
+
+        minLength: 3
+      });
+    }
+    else
+    {
+      if ($('#state_field').data('autocomplete')) {
+        $('#state_field').autocomplete("destroy");
+        $('#state_field').removeData('autocomplete');
+      }
+
+      if ($('#city_field').data('autocomplete')) {
+        $('#city_field').autocomplete("destroy");
+        $('#city_field').removeData('autocomplete');
+      }
+    }
+  })
+})(jQuery);
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index 65a7864..ce21588 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -917,6 +917,30 @@ class AccountControllerTest < ActionController::TestCase
     assert @response.body.blank?
   end
 
+  should "Search for state" do
+    create_state_and_city
+
+    xhr :get, :search_state, :state_name=>"Rio Grande"
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+    label = json_response[0]['label']
+
+    assert_equal label, "Rio Grande do Sul"
+  end
+
+  should "Search for city" do
+    create_state_and_city
+
+    xhr :get, :search_cities, :state_name=>"Rio Grande do Sul", :city_name=>"Lavras"
+
+    json_response = ActiveSupport::JSON.decode(@response.body)
+    label = json_response[0]['label']
+    category =  json_response[0]['category']
+
+    assert_equal category, "Rio Grande do Sul"
+    assert_equal label, "Lavras do Sul"
+  end
+
   protected
   def new_user(options = {}, extra_options ={})
     data = {:profile_data => person_data}
@@ -945,4 +969,18 @@ class AccountControllerTest < ActionController::TestCase
     environment.min_signup_delay = 0
     environment.save!
   end
+
+  def create_state_and_city
+    city = 'Lavras do Sul'
+    state = 'Rio Grande do Sul'
+
+    parent_region = fast_create(NationalRegion, :name => state,
+                                :national_region_code => '43',
+                                :national_region_type_id => NationalRegionType::STATE)
+
+    fast_create(NationalRegion, :name =>  city,
+                                :national_region_code => '431150',
+                                :national_region_type_id => NationalRegionType::CITY,
+                                :parent_national_region_code => parent_region.national_region_code)
+  end
 end
--
libgit2 0.21.2