diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 28f162b6068..8b9dc2ecec0 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -229,7 +229,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         },{
             model:  'res.users',
             fields: ['name','pos_security_pin','groups_id','barcode'],
-            domain: function(self){ return ['|', ['groups_id','=', self.config.group_pos_manager_id[0]],['groups_id','=', self.config.group_pos_user_id[0]]]; },
+            domain: function(self){ return [['company_id','=',self.user.company_id[0]],'|', ['groups_id','=', self.config.group_pos_manager_id[0]],['groups_id','=', self.config.group_pos_user_id[0]]]; },
             loaded: function(self,users){ 
                 // we attribute a role to the user, 'cashier' or 'manager', depending
                 // on the group the user belongs. 
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 615e5648842..43d0a92ae40 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -1056,7 +1056,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                     });
 
                     return ret;
-                } 
+                } else {
+                    return user;
+                }
             });
         },