diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 6ab4259cca2..a24df6e5c2d 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -287,11 +287,9 @@ class gamification_goal(osv.Model):
                 field_date_name = definition.field_date_id and definition.field_date_id.name or False
 
                 if definition.computation_mode == 'count' and definition.batch_mode:
-
+                    # batch mode, trying to do as much as possible in one request
                     general_domain = safe_eval(definition.domain)
-                    # goal_distinct_values = {goal.id: safe_eval(definition.batch_user_expression, {'user': goal.user_id}) for goal in goals}
                     field_name = definition.batch_distinctive_field.name
-                    # general_domain.append((field_name, 'in', list(set(goal_distinct_values.keys()))))
                     subqueries = {}
                     for goal in goals:
                         start_date = field_date_name and goal.start_date or False
diff --git a/addons/website_forum/data/badges_answer.xml b/addons/website_forum/data/badges_answer.xml
index 8b56a5ac02e..b88ac0945d1 100644
--- a/addons/website_forum/data/badges_answer.xml
+++ b/addons/website_forum/data/badges_answer.xml
@@ -4,7 +4,7 @@
 
         <!-- QUALITY (VOTES) -->
         <!-- Teacher: at least 3 upvotes -->
-<!--         <record id="badge_a_1" model="gamification.badge">
+        <record id="badge_a_1" model="gamification.badge">
             <field name="name">Teacher</field>
             <field name="description">Received at least 3 upvote for an answer for the first time</field>
             <field name="level">bronze</field>
@@ -15,8 +15,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), ('parent_id', '!=', False), ('vote_count', '>=', 3)]</field>
             <field name="condition">higher</field>
+            <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 3)]</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_teacher">
             <field name="name">Teacher</field>
@@ -24,6 +27,7 @@
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
             <field name="reward_id" eval="ref('badge_a_1')" />
+            <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>
@@ -32,9 +36,9 @@
             <field name="definition_id" eval="ref('definition_teacher')"/>
             <field name="challenge_id" eval="ref('challenge_teacher')"/>
             <field name="target_goal">1</field>
-        </record> -->
+        </record>
         <!-- Nice: at least 4 upvotes -->
-<!--         <record id="badge_a_2" model="gamification.badge">
+        <record id="badge_a_2" model="gamification.badge">
             <field name="name">Nice Answer</field>
             <field name="description">Answer voted up 4 times</field>
             <field name="level">bronze</field>
@@ -45,8 +49,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), ('parent_id', '!=', False), ('vote_count', '>=', 4)]</field>
             <field name="condition">higher</field>
+            <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 4)]</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_nice_answer">
             <field name="name">Nice Answer</field>
@@ -62,9 +69,9 @@
             <field name="definition_id" eval="ref('definition_nice_answer')"/>
             <field name="challenge_id" eval="ref('challenge_nice_answer')"/>
             <field name="target_goal">1</field>
-        </record> -->
+        </record>
         <!-- Good: at least 6 upvotes -->
-<!--         <record id="badge_a_3" model="gamification.badge">
+        <record id="badge_a_3" model="gamification.badge">
             <field name="name">Good Answer</field>
             <field name="description">Answer voted up 6 times</field>
             <field name="level">silver</field>
@@ -75,8 +82,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), ('parent_id', '!=', False), ('vote_count', '>=', 6)]</field>
             <field name="condition">higher</field>
+            <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 6)]</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_good_answer">
             <field name="name">Good Answer</field>
@@ -92,9 +102,9 @@
             <field name="definition_id" eval="ref('definition_good_answer')"/>
             <field name="challenge_id" eval="ref('challenge_good_answer')"/>
             <field name="target_goal">1</field>
-        </record> -->
+        </record>
         <!-- Great: at least 15 upvotes -->
-<!--         <record id="badge_a_4" model="gamification.badge">
+        <record id="badge_a_4" model="gamification.badge">
             <field name="name">Great Answer</field>
             <field name="description">Answer voted up 15 times</field>
             <field name="level">gold</field>
@@ -105,8 +115,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), ('parent_id', '!=', False), ('vote_count', '>=', 15)]</field>
             <field name="condition">higher</field>
+            <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 15)]</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_great_answer">
             <field name="name">Great Answer</field>
@@ -122,7 +135,7 @@
             <field name="definition_id" eval="ref('definition_great_answer')"/>
             <field name="challenge_id" eval="ref('challenge_great_answer')"/>
             <field name="target_goal">1</field>
-        </record> -->
+        </record>
 
         <!-- ACCEPTANCE -->
         <!-- Enlightened: at least 3 upvotes for an accepted answer -->