diff --git a/src/noosfero-spb/gov_user/views/organization_ratings_extra_fields_show_institution.html.erb b/src/noosfero-spb/gov_user/views/organization_ratings_extra_fields_show_institution.html.erb
index 137261b..3d7e398 100644
--- a/src/noosfero-spb/gov_user/views/organization_ratings_extra_fields_show_institution.html.erb
+++ b/src/noosfero-spb/gov_user/views/organization_ratings_extra_fields_show_institution.html.erb
@@ -1,7 +1,7 @@
 <% if user_rating.institution %>
 <div class="aditional-informations">
   <div class="comments-user-institution">
-    <span><%=_("Institution")%> :<span> <%= user_rating.institution.name unless user_rating.institution.nil? %>
+    <span><%=_("Institution")%> :<span> <%= user_rating.institution.name %>
   </div>
 </div>
 <% end %>
diff --git a/src/noosfero-spb/software_communities/lib/ext/create_organization_rating_comment.rb b/src/noosfero-spb/software_communities/lib/ext/create_organization_rating_comment.rb
new file mode 100644
index 0000000..c13397e
--- /dev/null
+++ b/src/noosfero-spb/software_communities/lib/ext/create_organization_rating_comment.rb
@@ -0,0 +1,15 @@
+require_dependency "create_organization_rating_comment"
+
+CreateOrganizationRatingComment.class_eval do
+  after_save :clear_rejected_rating_values
+
+  def clear_rejected_rating_values
+    if(self.status == Task::Status::CANCELLED)
+      puts "-----------------"*50
+      rating = OrganizationRating.find(self.organization_rating_id)
+      rating.saved_value = 0
+      rating.people_benefited = 0
+      rating.save
+    end
+  end
+end
--
libgit2 0.21.2