diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 2a08a1f8ffe..0c4a683ae33 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2143,7 +2143,7 @@ if ($action == 'create')
 			$delallowed = $user->rights->contrat->creer;
 
 
-			print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object);
+			print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, ($object->model_pdf ? $object->model_pdf : $conf->global->CONTRACT_ADDON_PDF), 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object);
 
 
 			// Show links to link elements
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index c9c895148bf..c53bc1a0750 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -450,7 +450,7 @@ class FormFile
 
 			if ($modulepart == 'company')
 			{
-				$showempty = 1;
+				$showempty = 1;		// can have no template active
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
@@ -514,6 +514,7 @@ class FormFile
 				}
 			} elseif ($modulepart == 'contract')
 			{
+				$showempty = 1;		// can have no template active
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
@@ -577,6 +578,7 @@ class FormFile
 				}
 			} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
 			{
+				$showempty = 1; 	// can have no template active
 				if (is_array($genallowed)) $modellist = $genallowed;
 				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 453bc34be8a..eda1a901986 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -189,7 +189,7 @@ function invoice_rec_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/card-rec.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("CardBill");
+	$head[$h][1] = $langs->trans("RepeatableInvoice");
 	$head[$h][2] = 'card';
 	$h++;