diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a78b4a91f55..d8b2d59a89c 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -255,8 +255,8 @@ class User extends CommonObject
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$p=$obj->param;
-					if ($p) $this->conf->$p = $obj->value;
+					$p=(! empty($obj->param)?$obj->param:'');
+					if (! empty($p)) $this->conf->$p = $obj->value;
 					$i++;
 				}
 				$this->db->free($resql);
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 0cbff5f77f7..a18a2698db3 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -1315,7 +1315,7 @@ else
 
                 if (! empty($groupslist))
                 {
-                    if (! ($conf->multicompany->enabled && $conf->multicompany->transverse_mode))
+                    if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
                     {
                         foreach($groupslist as $groupforuser)
                         {