diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index c3e0e00fdf6..3cce6710f7f 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -206,8 +206,8 @@ if (empty($reshook)) {
 
 			$object->oldcopy = clone $object;
 
-			$object->name	= GETPOST("nom", 'nohtml');
-			$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'restricthtml')));
+			$object->name = GETPOST("nom", 'nohtml');
+			$object->note = dol_htmlcleanlastbr(trim(GETPOST("note", 'restricthtml')));
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
@@ -218,7 +218,7 @@ if (empty($reshook)) {
 			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				$object->entity = 0;
 			} else {
-				$object->entity = GETPOST("entity");
+				$object->entity = GETPOSTISSET("entity") ? GETPOST("entity") : $conf->entity;
 			}
 
 			$ret = $object->update();