diff --git a/plugins/communities_ratings/controllers/communities_ratings_plugin_profile_controller.rb b/plugins/communities_ratings/controllers/communities_ratings_plugin_profile_controller.rb
index ef89de3..1eed855 100644
--- a/plugins/communities_ratings/controllers/communities_ratings_plugin_profile_controller.rb
+++ b/plugins/communities_ratings/controllers/communities_ratings_plugin_profile_controller.rb
@@ -47,15 +47,23 @@ class CommunitiesRatingsPluginProfileController < ProfileController
     community_rating.value = params[:community_rating_value] if params[:community_rating_value]
 
     if params[:comments] and (not params[:comments][:body].empty?)
-
-      create_comment = CreateCommunityRatingComment.create!(
-        params[:comments].merge(
-          :requestor => community_rating.person,
-          :source => community_rating.community,
-          :community_rating => community_rating,
-          :environment => environment
+      if !environment.communities_ratings_are_moderated
+        comment = Comment.new(params[:comments])
+        comment.author = community_rating.person
+        comment.community = community_rating.community
+        comment.save
+   
+        community_rating.comment = comment
+      else
+        create_comment = CreateCommunityRatingComment.create!(
+          params[:comments].merge(
+            :requestor => community_rating.person,
+            :source => community_rating.community,
+            :community_rating => community_rating,
+            :environment => environment
+          )
         )
-      )
+      end
     end
 
     if community_rating.save
diff --git a/plugins/communities_ratings/db/migrate/20151010171028_add_communities_rating_config_to_environment.rb b/plugins/communities_ratings/db/migrate/20151010171028_add_communities_rating_config_to_environment.rb
new file mode 100644
index 0000000..4a7c9dc
--- /dev/null
+++ b/plugins/communities_ratings/db/migrate/20151010171028_add_communities_rating_config_to_environment.rb
@@ -0,0 +1,11 @@
+class AddCommunitiesRatingConfigToEnvironment < ActiveRecord::Migration
+  	 
+  def change
+     add_column :environments, :communities_ratings_cooldown, :integer, :default => 24
+     add_column :environments, :communities_ratings_default_rating, :integer, :default => 1
+     add_column :environments, :communities_ratings_order, :string, :default => "most recent"
+     add_column :environments, :communities_ratings_per_page, :integer, :default => 10
+     add_column :environments, :communities_ratings_vote_once, :boolean, :default => false
+     add_column :environments, :communities_ratings_are_moderated, :boolean, :default => true
+  end
+end
diff --git a/plugins/communities_ratings/lib/create_community_rating_comment.rb b/plugins/communities_ratings/lib/create_community_rating_comment.rb
index 5589d73..ab22a38 100644
--- a/plugins/communities_ratings/lib/create_community_rating_comment.rb
+++ b/plugins/communities_ratings/lib/create_community_rating_comment.rb
@@ -28,7 +28,7 @@ class CreateCommunityRatingComment < Task
   end
 
   def information
-    message = _("%{requestor} wants to create a comment in the \"%{source}\" community. \n\n\n Comment: \n\n \"%{body}\"") %
+    message = _("%{requestor} wants to create a comment in the \"%{source}\" community. <div class=\"comment\"> Comment: <br> \"%{body}\"</div>") %
     {:requestor => self.requestor.name, :source => self.source.name, :body => self.body }
 
     {:message => message}
diff --git a/plugins/communities_ratings/lib/ext/environment.rb b/plugins/communities_ratings/lib/ext/environment.rb
index 6b75544..a38f958 100644
--- a/plugins/communities_ratings/lib/ext/environment.rb
+++ b/plugins/communities_ratings/lib/ext/environment.rb
@@ -1,7 +1,7 @@
 require_dependency 'environment'
 
 Environment.class_eval do
-  attr_accessible :communities_ratings_cooldown, :communities_ratings_default_rating, :communities_ratings_order, :communities_ratings_per_page, :communities_ratings_vote_once
+  attr_accessible :communities_ratings_cooldown, :communities_ratings_default_rating, :communities_ratings_order, :communities_ratings_per_page, :communities_ratings_vote_once, :communities_ratings_are_moderated
 
   COMMUNITIES_RATINGS_ORDER_OPTIONS = ["Most Recent", "Best Ratings"]
   COMMUNITIES_RATINGS_MINIMUM_RATING = 1
diff --git a/plugins/communities_ratings/style.css b/plugins/communities_ratings/style.css
index 39a6de7..565d2b5 100644
--- a/plugins/communities_ratings/style.css
+++ b/plugins/communities_ratings/style.css
@@ -189,4 +189,8 @@
   float: right;
   margin-top: 20px;
   padding-right: 15px;
+}
+
+.task_information .comment {
+  padding-left: 60px;
 }
\ No newline at end of file
diff --git a/plugins/communities_ratings/views/communities_ratings_plugin_admin/index.html.erb b/plugins/communities_ratings/views/communities_ratings_plugin_admin/index.html.erb
index 4205285..e4b9dfb 100644
--- a/plugins/communities_ratings/views/communities_ratings_plugin_admin/index.html.erb
+++ b/plugins/communities_ratings/views/communities_ratings_plugin_admin/index.html.erb
@@ -17,6 +17,10 @@
       <td><%= check_box :environment, :communities_ratings_vote_once %></td>
     </tr>
     <tr>
+      <td><%= _('The comments are moderated') %></td>
+      <td><%= check_box :environment, :communities_ratings_are_moderated %></td>
+    </tr>
+    <tr>
       <td><%= _('Time cooldown between evaluations from the same user') %></td>
 
       <% hours_options = {size: 1} %>
--
libgit2 0.21.2