diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d52ec6e334e..9075a8c6a25 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3755,7 +3755,7 @@ class Form
      * 	@param	int		$force_entity	Possibility to force entity
      *  @return	void
      */
-    function select_dolgroups($selected='',$htmlname='groupid',$show_empty=0,$exclude='',$disabled=0,$include='',$enableonly='',$force_entity='')
+    function select_dolgroups($selected='', $htmlname='groupid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity='')
     {
         global $conf,$user,$langs;
 
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 8d5418636bc..0cbff5f77f7 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -1313,15 +1313,15 @@ else
                 $usergroup=new UserGroup($db);
                 $groupslist = $usergroup->listGroupsForUser($fuser->id);
 
-                if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+                if (! empty($groupslist))
                 {
-                	if (! empty($groupslist))
-                	{
-                		foreach($groupslist as $groupforuser)
-                		{
-                			$exclude[]=$groupforuser->id;
-                		}
-                	}
+                    if (! ($conf->multicompany->enabled && $conf->multicompany->transverse_mode))
+                    {
+                        foreach($groupslist as $groupforuser)
+                        {
+                            $exclude[]=$groupforuser->id;
+                        }
+                    }
                 }
 
                 if ($caneditgroup)
@@ -1333,7 +1333,7 @@ else
                     print '<table class="noborder" width="100%">'."\n";
                     print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("GroupsToAdd").'</th>'."\n";
                     print '<th>';
-                    print $form->select_dolgroups('','group',1,$exclude,0,'','',$fuser->entity);
+                    print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $fuser->entity);
                     print ' &nbsp; ';
                     // Multicompany
                     if (! empty($conf->multicompany->enabled))
diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php
index f347d52b83a..b70f6fa200c 100644
--- a/htdocs/user/group/fiche.php
+++ b/htdocs/user/group/fiche.php
@@ -350,15 +350,15 @@ else
             // On selectionne les users qui ne sont pas deja dans le groupe
             $exclude = array();
 
-            if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+            if (! empty($object->members))
             {
-            	if (! empty($object->members))
-            	{
-            		foreach($object->members as $useringroup)
-            		{
-            			$exclude[]=$useringroup->id;
-            		}
-            	}
+                if (! ($conf->multicompany->enabled && $conf->multicompany->transverse_mode))
+                {
+                    foreach($object->members as $useringroup)
+                    {
+                        $exclude[]=$useringroup->id;
+                    }
+                }
             }
 
             if ($caneditperms)