diff --git a/addons/im/im.py b/addons/im/im.py
index 261905c0dcc..534991b8fc8 100644
--- a/addons/im/im.py
+++ b/addons/im/im.py
@@ -201,7 +201,7 @@ class im_user(osv.osv):
 
     def search_users(self, cr, uid, text_search, fields, limit, context=None):
         my_id = self.get_my_id(cr, uid, None, context)
-        found = self.search(cr, uid, [["name", "ilike", text_search], ["id", "<>", my_id]], limit=limit, context=context)
+        found = self.search(cr, uid, [["name", "ilike", text_search], ["id", "<>", my_id], ["uuid", "=", False]], limit=limit, context=context)
         return self.read(cr, uid, found, fields, context=context)
 
     def im_connect(self, cr, uid, uuid=None, context=None):
diff --git a/addons/im/static/src/js/im_common.js b/addons/im/static/src/js/im_common.js
index a2b7683d324..9e5e13a9099 100644
--- a/addons/im/static/src/js/im_common.js
+++ b/addons/im/static/src/js/im_common.js
@@ -102,9 +102,11 @@ function declare($, _, openerp) {
                     def = im_common.connection.rpc("/longpolling/im/gen_uuid", {}).then(function(my_uuid) {
                         uuid = my_uuid;
                         localStorage["oe_livesupport_uuid"] = uuid;
-                        return im_common.connection.model("im.user").call("assign_name", [uuid, self.options.userName]);
                     });
                 }
+                def = def.then(function() {
+                    return im_common.connection.model("im.user").call("assign_name", [uuid, self.options.userName]);
+                });
             }
 
             return def.then(function() {