diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 1ee779880d6..13234d94b91 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -368,7 +368,7 @@ class grant_badge_wizard(osv.TransientModel):
     _name = 'gamification.badge.user.wizard'
     _columns = {
         'user_id': fields.many2one("res.users", string='User', required=True),
-        'badge_id': fields.many2one("gamification.badge", string='Badge'),
+        'badge_id': fields.many2one("gamification.badge", string='Badge',  required=True),
         'comment': fields.text('Comment'),
     }
 
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 044e37238b3..e3c2cc3429d 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -43,7 +43,8 @@
             target="new"
             res_model="gamification.badge.user.wizard"
             context="{'default_badge_id': active_id, 'badge_id': active_id}"
-            view_type="form" view_mode="form"/>
+            view_type="form" view_mode="form"
+            view_id="gamification.view_badge_wizard_grant" />
 
         <record id="badge_list_view" model="ir.ui.view">
             <field name="name">Badge List</field>
@@ -65,7 +66,7 @@
             <field name="arch" type="xml">
                 <form string="Badge" version="7.0">
                     <header>
-                        <button string="Send this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [
+                        <button string="Grant this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [
                             '|',
                                 ('rule_auth', '=', 'nobody'),
                                 '&amp;',
diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/badge.py
index aacac358e27..1e99ce39eb0 100644
--- a/addons/hr_gamification/badge.py
+++ b/addons/hr_gamification/badge.py
@@ -69,9 +69,7 @@ class hr_grant_badge_wizard(osv.TransientModel):
         'employee_id': fields.many2one("hr.employee", string='Employee', required=True),
         'user_id': fields.related("employee_id", "user_id",
                                   type="many2one", relation="res.users",
-                                  store=True, string='User'),
-        'badge_id': fields.many2one("gamification.badge", string='Badge'),
-        'comment': fields.text('Comment'),
+                                  store=True, string='User')
     }
 
     def action_grant_badge(self, cr, uid, ids, context=None):
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 57557cf63ed..03d22a40fd0 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -50,7 +50,8 @@
             target="new"
             res_model="gamification.badge.user.wizard"
             context="{'default_employee_id': active_id, 'employee_id': active_id}"
-            view_type="form" view_mode="form"/>
+            view_type="form" view_mode="form"
+            view_id="gamification.view_badge_wizard_reward"/>
 
 
 
@@ -62,7 +63,7 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='button_box']" position="inside">
-                    <button string="Send Reward" type="action" name="%(action_reward_wizard)d" />
+                    <button string="Grant Badge" type="action" name="%(action_reward_wizard)d" />
                 </xpath>
                 <xpath expr="//page[@string='Public Information']" position="before">
                     <page string="Received Badges">