diff --git a/addons/website_forum/data/badges_answer.xml b/addons/website_forum/data/badges_answer.xml
index fa367e70ce8..9aed157df21 100644
--- a/addons/website_forum/data/badges_answer.xml
+++ b/addons/website_forum/data/badges_answer.xml
@@ -44,7 +44,7 @@
             <field name="level">bronze</field>
         </record>
         <record model="gamification.goal.definition" id="definition_nice_answer">
-            <field name="name">Nice Answer</field>
+            <field name="name">Nice Answer (4)</field>
             <field name="description">Answer voted up 4 times</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
@@ -78,7 +78,7 @@
             <field name="level">silver</field>
         </record>
         <record model="gamification.goal.definition" id="definition_good_answer">
-            <field name="name">Good Answer</field>
+            <field name="name">Good Answer (6)</field>
             <field name="description">Answer voted up 6 times</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
@@ -112,7 +112,7 @@
             <field name="level">gold</field>
         </record>
         <record model="gamification.goal.definition" id="definition_great_answer">
-            <field name="name">Great Answer</field>
+            <field name="name">Great Answer (15)</field>
             <field name="description">Answer voted up 15 times</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
@@ -182,7 +182,7 @@
             <field name="level">silver</field>
         </record>
         <record model="gamification.goal.definition" id="definition_guru">
-            <field name="name">Guru</field>
+            <field name="name">Guru (15)</field>
             <field name="description">Answer accepted with 15 or more votes</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
@@ -194,7 +194,7 @@
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_guru">
-            <field name="name">Great Answer</field>
+            <field name="name">Guru</field>
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
diff --git a/addons/website_forum/data/badges_moderation.xml b/addons/website_forum/data/badges_moderation.xml
index c169e5bc668..0a6f2d9925d 100644
--- a/addons/website_forum/data/badges_moderation.xml
+++ b/addons/website_forum/data/badges_moderation.xml
@@ -3,38 +3,15 @@
     <data>
 
         <!-- Cleanup: answer or question edition -->
+        <!-- Not rollback feature in forum -->
 <!--         <record id="badge_3" model="gamification.badge">
             <field name="name">Cleanup</field>
             <field name="description">First rollback</field>
             <field name="level">gold</field>
-        </record>
-        <record model="gamification.goal.definition" id="definition_cleanup">
-            <field name="name">Cleanup</field>
-            <field name="description">Edit answer or question</field>
-            <field name="computation_mode">count</field>
-            <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('mail.model_mail_message')"/>
-            <field name="domain" eval="[('author_id', '=', user.partner_id.id), ('model', '=', 'forum.post'), ('subtype_id', 'in', [ref('website_forum.mt_answer_edit'), ref('website_forum.mt_question_edit')])]"/>
-            <field name="condition">higher</field>
-        </record>
-        <record model="gamification.challenge" id="challenge_cleanup">
-            <field name="name">Cleanup</field>
-            <field name="period">once</field>
-            <field name="visibility_mode">personal</field>
-            <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_3')"/>
-            <field name="autojoin_group_id" eval="ref('base.group_user')"/>
-            <field name="state">inprogress</field>
-            <field name="category">forum</field>
-        </record>
-        <record model="gamification.challenge.line" id="line_cleanup">
-            <field name="definition_id" eval="ref('definition_cleanup')"/>
-            <field name="challenge_id" eval="ref('challenge_cleanup')"/>
-            <field name="target_goal">1</field>
         </record> -->
 
         <!-- Critic: downvote based -->
-<!--         <record id="badge_5" model="gamification.badge">
+        <record id="badge_5" model="gamification.badge">
             <field name="name">Critic</field>
             <field name="description">First downvote</field>
             <field name="level">bronze</field>
@@ -45,8 +22,11 @@
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
             <field name="model_id" eval="ref('website_forum.model_forum_post_vote')"/>
-            <field name="domain">[('create_uid', '=', user.id), ('vote', '=', '-1')]</field>
             <field name="condition">higher</field>
+            <field name="domain">[('vote', '=', '-1')]</field>
+            <field name="batch_mode">True</field>
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_vote_user_id')" />
+            <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_critic">
             <field name="name">Critic</field>
@@ -54,6 +34,7 @@
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
             <field name="reward_id" eval="ref('badge_5')" />
+            <field name="reward_realtime">True</field>
             <field name="autojoin_group_id" eval="ref('base.group_user')"/>
             <field name="state">inprogress</field>
             <field name="category">forum</field>
@@ -62,10 +43,10 @@
             <field name="definition_id" eval="ref('definition_critic')"/>
             <field name="challenge_id" eval="ref('challenge_critic')"/>
             <field name="target_goal">1</field>
-        </record> -->
+        </record>
 
         <!-- Disciplined: delete own post with >=3 upvotes -->
-<!--         <record id="badge_6" model="gamification.badge">
+        <record id="badge_6" model="gamification.badge">
             <field name="name">Disciplined</field>
             <field name="description">Deleted own post with 3 or more upvotes</field>
             <field name="level">bronze</field>
@@ -76,8 +57,11 @@
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
             <field name="model_id" eval="ref('website_forum.model_forum_post')" />
-            <field name="domain">[('create_uid', '=', user.id), ('vote_count', '>=', 3), ('active', '=', False)]</field>
             <field name="condition">higher</field>
+            <field name="domain">[('vote_count', '>=', 3), ('active', '=', False)]</field>
+            <field name="batch_mode">True</field>
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_disciplined">
             <field name="name">Disciplined</field>
@@ -85,6 +69,7 @@
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
             <field name="reward_id" eval="ref('badge_6')" />
+            <field name="reward_realtime">True</field>
             <field name="autojoin_group_id" eval="ref('base.group_user')" />
             <field name="state">inprogress</field>
             <field name="category">forum</field>
@@ -93,10 +78,10 @@
             <field name="definition_id" eval="ref('definition_disciplined')"/>
             <field name="challenge_id" eval="ref('challenge_disciplined')"/>
             <field name="target_goal">1</field>
-        </record> -->
+        </record>
 
         <!-- Editor: first edit -->
-<!--         <record id="badge_7" model="gamification.badge">
+        <record id="badge_7" model="gamification.badge">
             <field name="name">Editor</field>
             <field name="description">First edit</field>
             <field name="level">gold</field>
@@ -107,9 +92,11 @@
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
             <field name="model_id" eval="ref('mail.model_mail_message')" />
-            <field name="domain">[('create_uid','=',user.id), '|', ('name','!=',False), ('content','!=',False)]</field>
-            <field name="domain" eval="[('author_id', '=', user.partner_id.id), ('model', '=', 'forum.post'), ('subtype_id', 'in', [ref('website_forum.mt_answer_edit'), ref('website_forum.mt_question_edit')])]"/>
             <field name="condition">higher</field>
+            <field name="domain" eval="[('model', '=', 'forum.post'), ('subtype_id', 'in', [ref('website_forum.mt_answer_edit'), ref('website_forum.mt_question_edit')])]"/>
+            <field name="batch_mode">True</field>
+            <field name="batch_distinctive_field" eval="ref('mail.field_mail_message_author_id')" />
+            <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_editor">
             <field name="name">Editor</field>
@@ -117,6 +104,7 @@
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
             <field name="reward_id" eval="ref('badge_7')" />
+            <field name="reward_realtime">True</field>
             <field name="autojoin_group_id" eval="ref('base.group_user')" />
             <field name="state">inprogress</field>
             <field name="category">forum</field>
@@ -125,37 +113,38 @@
             <field name="definition_id" eval="ref('definition_editor')"/>
             <field name="challenge_id" eval="ref('challenge_editor')"/>
             <field name="target_goal">1</field>
-        </record> -->
+        </record>
 
 
 <!--         <record id="badge_22" model="gamification.badge">
             <field name="name">Organizer</field>
             <field name="description">First retag</field>
             <field name="level">bronze</field>
-        </record> -->
-
-<!--         <record model="gamification.goal.definition" id="definition_notable_question">
+        </record>
+        <record model="gamification.goal.definition" id="definition_notable_question">
             <field name="name">Organizer</field>
             <field name="description">Your First retag</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
             <field name="model_id" eval="ref('website_forum.model_website_forum_post_history')" />
-            <field name="domain">[('create_uid','=',user.id), ('tags','!=',False)]</field>
             <field name="condition">higher</field>
-        </record> -->
-
-<!--         <record model="gamification.challenge" id="challenge_notable_question">
+            <field name="domain">[('tags','!=',False)]</field>
+            <field name="batch_mode">True</field>
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_user_expression">user.id</field>
+        </record>
+        <record model="gamification.challenge" id="challenge_notable_question">
             <field name="name">Organizer</field>
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
             <field name="reward_id" eval="ref('badge_22')" />
+            <field name="reward_realtime">True</field>
             <field name="autojoin_group_id" eval="ref('base.group_user')" />
             <field name="state">inprogress</field>
             <field name="category">forum</field>
-        </record> -->
-
-<!--         <record model="gamification.challenge.line" id="line_notable_question">
+        </record>
+        <record model="gamification.challenge.line" id="line_notable_question">
             <field name="definition_id" eval="ref('definition_notable_question')" />
             <field name="target_goal">1</field>
             <field name="challenge_id" eval="ref('challenge_notable_question')" />
@@ -166,32 +155,31 @@
             <field name="name">Associate Editor</field>
             <field name="description">Edited 30 entries</field>
             <field name="level">silver</field>
-        </record> -->
-
-
-
-<!--         <record model="gamification.goal.definition" id="definition_associate_editor">
+        </record>
+        <record model="gamification.goal.definition" id="definition_associate_editor">
             <field name="name">Associate Editor</field>
             <field name="description">Edit 30 answer or question</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
             <field name="model_id" eval="ref('website_forum.model_website_forum_post_history')" />
-            <field name="domain">[('create_uid','=',user.id), '|', ('name','!=',False), ('content','!=',False)]</field>
             <field name="condition">higher</field>
-        </record> -->
-
-<!--         <record model="gamification.challenge" id="challenge_associate_editor">
+            <field name="domain">['|', ('name','!=',False), ('content','!=',False)]</field>
+            <field name="batch_mode">True</field>
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_user_expression">user.id</field>
+        </record>
+        <record model="gamification.challenge" id="challenge_associate_editor">
             <field name="name">Associate Editor</field>
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
             <field name="reward_id" eval="ref('badge_29')" />
+            <field name="reward_realtime">True</field>
             <field name="autojoin_group_id" eval="ref('base.group_user')" />
             <field name="state">inprogress</field>
             <field name="category">forum</field>
-        </record> -->
-
-<!--         <record model="gamification.challenge.line" id="line_associate_editor">
+        </record>
+        <record model="gamification.challenge.line" id="line_associate_editor">
             <field name="definition_id" eval="ref('definition_associate_editor')" />
             <field name="target_goal">30</field>
             <field name="challenge_id" eval="ref('challenge_associate_editor')" />
@@ -229,75 +217,76 @@ result = int(len(data) >= 15)</field>
             <field name="definition_id" eval="ref('definition_enthusiast')"/>
             <field name="challenge_id" eval="ref('challenge_enthusiast')"/>
             <field name="target_goal">1</field>
-        </record>
+        </record> -->
 
         <record id="badge_31" model="gamification.badge">
             <field name="name">Supporter</field>
             <field name="description">First upvote</field>
             <field name="level">gold</field>
-        </record> -->
-
-<!--         <record model="gamification.goal.definition" id="definition_supporter">
+        </record>
+        <record model="gamification.goal.definition" id="definition_supporter">
             <field name="name">Supporter</field>
-            <field name="description">First upwnvote</field>
+            <field name="description">First upvote</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
             <field name="model_id" eval="ref('website_forum.model_forum_post_vote')" />
-            <field name="domain">[('user_id','=',user.id), ('vote', '=', '1')]</field>
             <field name="condition">higher</field>
+            <field name="domain">[('vote', '=', '1')]</field>
+            <field name="batch_mode">True</field>
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_vote_user_id')" />
+            <field name="batch_user_expression">user.id</field>
         </record>
-
         <record model="gamification.challenge" id="challenge_supporter">
             <field name="name">Supporter</field>
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
             <field name="reward_id" eval="ref('badge_31')" />
+            <field name="reward_realtime">True</field>
             <field name="autojoin_group_id" eval="ref('base.group_user')" />
             <field name="state">inprogress</field>
             <field name="category">forum</field>
         </record>
-
         <record model="gamification.challenge.line" id="line_supporter">
             <field name="definition_id" eval="ref('definition_supporter')" />
             <field name="target_goal">1</field>
             <field name="challenge_id" eval="ref('challenge_supporter')" />
-        </record> -->
+        </record>
 
 
-<!--         <record id="badge_23" model="gamification.badge">
+        <record id="badge_23" model="gamification.badge">
             <field name="name">Peer Pressure</field>
             <field name="description">Deleted own post with 3 or more downvotes</field>
             <field name="level">gold</field>
         </record>
-
         <record model="gamification.goal.definition" id="definition_peer_pressure">
             <field name="name">Peer Pressure</field>
             <field name="description">Delete own post with 3 or more down votes</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
             <field name="model_id" eval="ref('website_forum.model_forum_post')" />
-            <field name="domain">[('create_uid','=',user.id), ('vote_count', '&lt;=', -3), ('active', '=', False)]</field>
             <field name="condition">higher</field>
+            <field name="domain">[('vote_count', '&lt;=', -3), ('active', '=', False)]</field>
+            <field name="batch_mode">True</field>
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_user_expression">user.id</field>
         </record>
-
         <record model="gamification.challenge" id="challenge_peer_pressure">
             <field name="name">Peer Pressure</field>
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
             <field name="reward_id" eval="ref('badge_23')" />
+            <field name="reward_realtime">True</field>
             <field name="autojoin_group_id" eval="ref('base.group_user')" />
             <field name="state">inprogress</field>
             <field name="category">forum</field>
         </record>
-
         <record model="gamification.challenge.line" id="line_peer_pressure">
             <field name="definition_id" eval="ref('definition_peer_pressure')" />
             <field name="target_goal">1</field>
             <field name="challenge_id" eval="ref('challenge_peer_pressure')" />
-        </record> -->
-
+        </record>
 
     </data>
 </openerp>
\ No newline at end of file