diff --git a/db/migrate/20150714123613_add_institution_to_community_rating.rb b/db/migrate/20150714123613_add_institution_to_community_rating.rb
new file mode 100644
index 0000000..88554f5
--- /dev/null
+++ b/db/migrate/20150714123613_add_institution_to_community_rating.rb
@@ -0,0 +1,11 @@
+class AddInstitutionToCommunityRating < ActiveRecord::Migration
+  def up
+    change_table :community_ratings do |t|
+      t.belongs_to :institution
+    end
+  end
+
+  def down
+    remove_column :community_ratings, :institution_id
+  end
+end
diff --git a/lib/ext/community_rating.rb b/lib/ext/community_rating.rb
new file mode 100644
index 0000000..78e78ac
--- /dev/null
+++ b/lib/ext/community_rating.rb
@@ -0,0 +1,18 @@
+require_dependency "community_rating"
+
+CommunityRating.class_eval do
+  attr_accessible :institution_id
+
+  belongs_to :institution
+
+  validate :verify_institution
+
+  private
+
+    def verify_institution
+      if self.institution_id != nil
+        institution = Institution.find_by_id self.institution_id
+        self.errors.add :institution, _("not found") unless institution
+      end
+    end
+end
diff --git a/lib/institution.rb b/lib/institution.rb
index 399c5f0..4145de1 100644
--- a/lib/institution.rb
+++ b/lib/institution.rb
@@ -1,4 +1,7 @@
 class Institution < ActiveRecord::Base
+  has_many :community_ratings
+  alias :communities_ratings :community_ratings
+  alias :communities_ratings= :community_ratings=
 
   SEARCH_FILTERS = {
     :order => %w[],
diff --git a/public/views/gov-user-comments-extra-fields.js b/public/views/gov-user-comments-extra-fields.js
index 7a5c44c..a164b57 100644
--- a/public/views/gov-user-comments-extra-fields.js
+++ b/public/views/gov-user-comments-extra-fields.js
@@ -5,11 +5,11 @@ modulejs.define("GovUserCommentsExtraFields", ['jquery','CreateInstitution'], fu
     }
 
 
-    function prepend_to_aditional_information() {
-      var aditional_information = $(".comments-software-extra-fields");
-      var institution_comments = $("#input_institution_comments");
+    function prepend_to_additional_information() {
+      var additional_information = $("#comments-additional-information");
+      var institution_comments = $("#input_institution_comments").remove();
 
-      aditional_information.prepend(institution_comments.remove());
+      institution_comments.insertAfter(additional_information);
     }
 
 
@@ -19,7 +19,7 @@ modulejs.define("GovUserCommentsExtraFields", ['jquery','CreateInstitution'], fu
       },
 
       init: function() {
-        prepend_to_aditional_information();
+        prepend_to_additional_information();
         set_events();
       }
     }
diff --git a/views/comments_extra_field.html.erb b/views/comments_extra_field.html.erb
index adeed44..3166b0f 100644
--- a/views/comments_extra_field.html.erb
+++ b/views/comments_extra_field.html.erb
@@ -1,7 +1,10 @@
 <div id="input_institution_comments">
   <%= label_tag "input_institution", _("Organiztion name or Enterprise name")%>
-  <%= text_field_tag "comments[instituton_name]", "", id: "input_institution" %>
+
+  <input type="text" id="input_institution">
+
   <%= content_tag(:div, _("No institution found"),
                   :id=>"institution_empty_ajax_message",
                   :class=>"errorExplanation hide-field") %>
+  <%= hidden_field_tag "community_rating[institution_id]", "", id: "institution_selected" %>
 </div>
--
libgit2 0.21.2