diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/badge.py
index 2834960f078..a278f42d49f 100644
--- a/addons/hr_gamification/badge.py
+++ b/addons/hr_gamification/badge.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
+from openerp.tools.translate import _
 
 
 class hr_gamification_badge_user(osv.Model):
@@ -70,6 +71,7 @@ class hr_grant_badge_wizard(osv.TransientModel):
                                   type="many2one", relation="res.users",
                                   store=True, string='User'),
         'badge_id': fields.many2one("gamification.badge", string='Badge'),
+        'comment': fields.text('Comment'),
     }
 
     def action_grant_badge(self, cr, uid, ids, context=None):
@@ -80,6 +82,9 @@ class hr_grant_badge_wizard(osv.TransientModel):
         badge_user_obj = self.pool.get('gamification.badge.user')
 
         for wiz in self.browse(cr, uid, ids, context=context):
+            if not wiz.user_id:
+                raise osv.except_osv(_('Warning!'), _('You can send badges only to employees linked to a user.'))
+
             if badge_obj.can_grant_badge(cr, uid,
                                          user_from_id=uid,
                                          badge_id=wiz.badge_id.id,
@@ -89,9 +94,9 @@ class hr_grant_badge_wizard(osv.TransientModel):
                     'user_id': wiz.user_id.id,
                     'badge_id': wiz.badge_id.id,
                     'employee_id': wiz.employee_id.id,
+                    'comment': wiz.comment,
                 }
                 badge_user = badge_user_obj.create(cr, uid, values, context=context)
-                #badge_obj.write(cr, uid, [badge.id], {'owner_ids': [(1, badge_user.id)]}, context=context)
 
                 user_from = self.pool.get('res.users').browse(cr, uid, uid, context=context)
 
@@ -106,13 +111,12 @@ class hr_employee(osv.osv):
     _inherit = "hr.employee"
 
     def _get_employee_badges(self, cr, uid, ids, field_name, arg, context=None):
-        """Return the list of badges assigned to the employee"""
+        """Return the list of badge_users assigned to the employee"""
         res = {}
         for employee in self.browse(cr, uid, ids, context=context):
-            badge_users = self.pool.get('gamification.badge.user').search(cr, uid, [('employee_id', '=', employee.id)], context=context)
-            res[employee.id] = self.pool.get('gamification.badge').search(cr, uid, [('owner_ids', 'in', badge_users)], context=context)
+            res[employee.id] = self.pool.get('gamification.badge.user').search(cr, uid, [('employee_id', '=', employee.id)], context=context)
         return res
 
     _columns = {
-        'badge_ids': fields.function(_get_employee_badges, type="one2many", obj='gamification.badge', string="Employee Badges")
+        'badge_ids': fields.function(_get_employee_badges, type="one2many", obj='gamification.badge.user', string="Employee Badges")
     }
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 3ea87d54bf3..38f5a0fd0a0 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -11,6 +11,7 @@
                     <group>
                         <field name="employee_id" />
                         <field name="badge_id" invisible="1"/>
+                        <field name="comment" />
                     </group>
                     <footer>
                         <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
@@ -29,7 +30,7 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
             <xpath expr="//page[@string='Public Information']" position="before">
-                <page string="Badges">
+                <page string="Received Badges">
                     <field name="badge_ids" widget="many2many_kanban" />
                 </page>
             </xpath>