diff --git a/odex25_mobile/odex_mobile/models/push_notification_mixin.py b/odex25_mobile/odex_mobile/models/push_notification_mixin.py
index 959b9827f..3b8980422 100644
--- a/odex25_mobile/odex_mobile/models/push_notification_mixin.py
+++ b/odex25_mobile/odex_mobile/models/push_notification_mixin.py
@@ -34,7 +34,7 @@ class PushNotificationMixin(models.AbstractModel):
                 return credentials.token
         for rec in self:
             if not rec.fcm_token:
-                raise UserError(_("FCM Token is required"))
+                raise UserError(_("FCM Token is required for record %s:%s") % (rec._name, rec.name))
             if not self.env.user.company_id.service_account:
                 raise UserError(_("Firebase Service Account file is required"))
 
diff --git a/odex25_mobile/odex_mobile/models/res_partner.py b/odex25_mobile/odex_mobile/models/res_partner.py
index 081d1f3ba..3f49d7c86 100644
--- a/odex25_mobile/odex_mobile/models/res_partner.py
+++ b/odex25_mobile/odex_mobile/models/res_partner.py
@@ -25,7 +25,9 @@ class Partner(models.Model):
         notification = self.env['firebase.notification'].sudo().create(notification_data)
         
         if all_device:
-            notification.partner_ids.send_push_notification(str(message_title), str(message_body))
+            emp = self.env['hr.employee'].sudo().search([('user_id', 'in', notification.partner_ids.user_ids.ids)])
+            if emp.user_id.partner_id:
+                emp.send_push_notification(str(message_title), str(message_body))
             for reg in self.firebase_registration_ids:
                 reg.with_context(lang=self.lang).send_message(
                     message_title,