diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 76b20ae2738..9d83687e102 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -160,10 +160,11 @@ class gamification_badge(osv.Model):
             help="The number of time the current user has received this badge this month."),
     }
 
-    _default = {
+    _defaults = {
         'stat_count': 0,
         'stat_count_distinct': 0,
         'stat_this_month': 0,
+        'rule_auth': 'everyone',
         'rule_automatic': 'manual',
     }
 
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index c160c264a0b..d45df776d86 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -74,14 +74,18 @@
                             </h1>
                         </div>
                         <field name="description" />
-                        <group string="Rules">
-                            <field name="rule_auth"/>
+                        <group string="User Rules">
+                            <field name="rule_auth" string="Allowed to Grant" />
                             <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}" widget="many2many_tags" />
                             <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}" widget="many2many_tags" />
-                            <field name="compute_code" attrs="{'invisible': [('rule_auth','!=','computed')]}"/>
                             <field name="rule_max"/>
                             <field name="rule_max_number" attrs="{'invisible': [('rule_max','=',False)]}"/>
                         </group>
+                        <group string="Automatic Rules">
+                            <field name="rule_automatic"/>
+                            <field name="compute_code" attrs="{'invisible': [('rule_automatic','!=','python')]}"/>
+                            <field name="goal_type_ids" attrs="{'invisible': [('rule_automatic','!=','goals')]}" widget="many2many_tags"/>
+                        </group>
                     </sheet>
                 </form>
             </field>