diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index b3d41d80ffb..6cf3c816a24 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -374,7 +374,6 @@ class FormOther
      */
     function select_salesrepresentatives($selected, $htmlname, $user, $showstatus=0, $showempty=1, $morecss='')
     {
-        // phpcs:enable
         global $conf, $langs;
         $langs->load('users');
 
@@ -395,7 +394,7 @@ class FormOther
         if ($showempty) $out.='<option value="0">&nbsp;</option>';
 
         // Get list of users allowed to be viewed
-        $sql_usr = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.statut, u.login";
+        $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
         $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u";
 
         if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
@@ -403,10 +402,9 @@ class FormOther
         	if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
         		$sql_usr.= " WHERE u.entity IS NOT NULL"; // Show all users
         	} else {
-        		$sql_usr.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
-        		$sql_usr.= " WHERE ((ug.fk_user = u.rowid";
-        		$sql_usr.= " AND ug.entity IN (".getEntity('user')."))";
-        		$sql_usr.= " OR u.entity = 0)"; // Show always superadmin
+        		$sql_usr.= ",
+        		$sql_usr.= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('user')."))";
+        		$sql_usr.= " OR u.entity = 0"; // Show always superadmin
         	}
         }
         else
@@ -428,7 +426,7 @@ class FormOther
             	if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
             		$sql_usr.= " WHERE u2.entity IS NOT NULL"; // Show all users
             	} else {
-            		$sql_usr.= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('user').") )";
+            		$sql_usr.= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('user')."))";
             	}
             }
             else