diff --git a/src/noosfero-spb/gov_user/lib/ext/organization_rating.rb b/src/noosfero-spb/gov_user/lib/ext/organization_rating.rb
index fb2b59e..d2b36c8 100644
--- a/src/noosfero-spb/gov_user/lib/ext/organization_rating.rb
+++ b/src/noosfero-spb/gov_user/lib/ext/organization_rating.rb
@@ -13,7 +13,8 @@ OrganizationRating.class_eval do
   def verify_institution
     if self.institution != nil
       institution = Institution.find_by_id self.institution.id
-      self.errors.add :institution, _("not found") unless institution
+      self.errors.add :institution, _("institution not found") unless institution
+      return !!institution
     end
   end
 
diff --git a/src/noosfero-spb/gov_user/public/views/create-institution.js b/src/noosfero-spb/gov_user/public/views/create-institution.js
index 0ee38eb..434c387 100644
--- a/src/noosfero-spb/gov_user/public/views/create-institution.js
+++ b/src/noosfero-spb/gov_user/public/views/create-institution.js
@@ -17,8 +17,8 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
   };
 
   function set_institution_field_name(name) {
-    $("#input_institution").attr("value", "");
     $("#input_institution").attr("value", name);
+    $("#input_institution").autocomplete("search");
   }
 
   function open_create_institution_modal(evt) {
@@ -99,13 +99,14 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
       var institution_name  = response.institution_data.name;
       var institution_id = response.institution_data.id;
 
-      $("#institution_dialog").html("<div class='errorExplanation'><h2>"+response.message+"</h2></div>");
-      $("#create_institution_errors").switchClass("show-field", "hide-field");
+      set_institution_field_name($("#community_name").val());
 
+      $("#create_institution_errors").switchClass("show-field", "hide-field");
       $(".institution_container").append(get_clone_institution_data(institution_id));
       add_selected_institution_to_list(institution_id, institution_name);
 
       $(".remove-institution").click(remove_institution);
+      $('#institution_dialog').dialog('close');
     } else {
       var errors = create_error_list(response);
       $("#create_institution_errors").switchClass("hide-field", "show-field").html("<h2>"+response.message+"</h2>"+errors);
@@ -233,23 +234,6 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
 
               toggle_extra_fields_style_status(true);
               $("#create_institution_link").click(open_create_institution_modal);
-            } else {
-              $("li.ui-menu-item a.ui-corner-all").click(function() {
-                $('#institution_empty_ajax_message').switchClass("show-field", "hide-field");
-                $("#create_institution_link").remove();
-                toggle_extra_fields_style_status(false);
-              });
-              $("li.ui-menu-item a.ui-corner-all").keypress(function(e) {
-                alert(e);
-                var key = e.keyCode;
-                alert(key);
-                if(key == 13) {
-                  $("li.ui-menu-item a.ui-corner-all").click();
-                }
-              });
-              //$('#institution_empty_ajax_message').switchClass("show-field", "hide-field");
-              //$("#create_institution_link").remove();
-              //toggle_extra_fields_style_status(false);
             }
           },
           error: function(ajax, stat, errorThrown) {
@@ -261,6 +245,9 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
       minLength: 2,
 
       select : function (event, selected) {
+        $('#institution_empty_ajax_message').switchClass("show-field", "hide-field");
+        $("#create_institution_link").remove();
+        toggle_extra_fields_style_status(false);
         $("#institution_selected").val(selected.item.id).attr("data-name", selected.item.label);
       }
     });
--
libgit2 0.21.2