diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 908df672c30..77bd654147d 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2997,7 +2997,11 @@ if ($action == 'create') {
 	}
 
 	// when bank account is empty (means not override by payment mode form a other object, like third-party), try to use default value
-	$fk_account = GETPOSTISSET("fk_account") ? GETPOST("fk_account", 'int') : $fk_account;
+	if ($socid > 0 && $fk_account) {	// A company has already been set and it has a default fk_account
+		$fk_account = GETPOSTISSET('fk_account') ? GETPOST("fk_account", 'int') : $fk_account;	// The GETPOST is used only if form was posted to avoid to take default value, because in such case, the default must be the one of the company
+	} else {	// No company forced
+		$fk_account = GETPOST("fk_account", 'int');
+	}
 
 	if (!empty($soc->id)) {
 		$absolute_discount = $soc->getAvailableDiscounts();
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index c54bd3637ae..af0bc5f1eea 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -49,7 +49,7 @@ if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
 }
 
-$permissionnote = $user->rights->produit->creer; // Used by the include of actions_setnotes.inc.php
+$permissionnote = ($user->rights->produit->creer || $user->rights->service->creer); // Used by the include of actions_setnotes.inc.php
 
 if ($object->id > 0) {
 	if ($object->type == $object::TYPE_PRODUCT) {