diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 56126f2f56b..22d9ddab704 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -252,6 +252,8 @@ if ($reshook == 0) {
 	}
 }
 
+$error = 0;
+
 $id = 25;
 
 $acceptlocallinktomedia = (acceptLocalLinktoMedia() > 0 ? 1 : 0);
@@ -436,82 +438,94 @@ if (empty($reshook)) {
 		if ($ok && GETPOST('actionmodify')) {
 			$rowidcol = "rowid";
 
-			// Modify entry
-			$sql = "UPDATE ".$tabname[$id]." SET ";
-			// Modify value of fields
-			$i = 0;
-			foreach ($listfieldmodify as $field) {
-				if ($field == 'entity') {
-					// entity not present on listfieldmodify array
-					$keycode = $field;
-					$_POST[$keycode] = $conf->entity;
-				} else {
-					$keycode = $listfieldvalue[$i];
-				}
-
-				if ($field == 'lang') {
-					$keycode = 'langcode';
-				}
-				if (empty($keycode)) {
-					$keycode = $field;
-				}
-
-				// Rename some POST variables into a generic name
-				if ($field == 'fk_user' && !(GETPOSTINT('fk_user') > 0)) {
-					$_POST['fk_user'] = '';
-				}
-				if ($field == 'topic') {
-					$_POST['topic'] = GETPOST('topic-'.$rowid);
-				}
-				if ($field == 'joinfiles') {
-					$_POST['joinfiles'] = GETPOST('joinfiles-'.$rowid);
-				}
-				if ($field == 'content') {
-					$_POST['content'] = GETPOST('content-'.$rowid, 'restricthtml');
-				}
-				if ($field == 'content_lines') {
-					$_POST['content_lines'] = GETPOST('content_lines-'.$rowid, 'restricthtml');
-				}
-
-				if ($i) {
-					$sql .= ", ";
-				}
-				$sql .= $field."=";
-
-				if (GETPOST($keycode) == '' || (!in_array($keycode, array('langcode', 'position', 'private', 'defaultfortype')) && !GETPOST($keycode))) {
-					$sql .= "null"; // langcode,... must be '' if not defined so the unique key that include lang will work
-				} elseif (GETPOST($keycode) == '0' && $keycode == 'langcode') {
-					$sql .= "''"; // langcode must be '' if not defined so the unique key that include lang will work
-				} elseif ($keycode == 'fk_user') {
-					if (!$user->admin) {	// A non admin user can only edit its own template
-						$sql .= " ".((int) $user->id);
-					} else {
-						$sql .= " ".(GETPOSTINT($keycode));
-					}
-				} elseif ($keycode == 'content') {
-					$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-				} elseif (in_array($keycode, array('joinfiles', 'defaultfortype', 'private', 'position'))) {
-					$sql .= GETPOSTINT($keycode);
-				} else {
-					$sql .= "'".$db->escape(GETPOST($keycode, 'alphanohtml'))."'";
-				}
-				$i++;
-			}
-
-			$sql .= " WHERE ".$db->escape($rowidcol)." = ".((int) $rowid);
-			if (!$user->admin) {	// A non admin user can only edit its own template
-				$sql .= " AND fk_user  = ".((int) $user->id);
-			}
-			//print $sql;exit;
-			dol_syslog("actionmodify", LOG_DEBUG);
-			//print $sql;
-			$resql = $db->query($sql);
-			if ($resql) {
-				setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-			} else {
-				setEventMessages($db->error(), null, 'errors');
+			if (GETPOSTINT('fk_user') <= 0 && GETPOST('private')) {
+				setEventMessages($langs->trans("AnOwnerMustBeSetIfEmailTemplateIsPrivate"), null, 'errors');
+				$error++;
 				$action = 'edit';
 			}
+
+			if (!$error) {
+				// Modify entry
+				$sql = "UPDATE ".$tabname[$id]." SET ";
+				// Modify value of fields
+				$i = 0;
+				foreach ($listfieldmodify as $field) {
+					if ($field == 'entity') {
+						// entity not present on listfieldmodify array
+						$keycode = $field;
+						$_POST[$keycode] = $conf->entity;
+					} else {
+						$keycode = $listfieldvalue[$i];
+					}
+
+					if ($field == 'lang') {
+						$keycode = 'langcode';
+					}
+					if (empty($keycode)) {
+						$keycode = $field;
+					}
+
+					// Rename some POST variables into a generic name
+					if ($field == 'fk_user' && !(GETPOSTINT('fk_user') > 0)) {
+						$_POST['fk_user'] = '';
+					}
+					if ($field == 'topic') {
+						$_POST['topic'] = GETPOST('topic-'.$rowid);
+					}
+					if ($field == 'joinfiles') {
+						$_POST['joinfiles'] = GETPOST('joinfiles-'.$rowid);
+					}
+					if ($field == 'content') {
+						$_POST['content'] = GETPOST('content-'.$rowid, 'restricthtml');
+					}
+					if ($field == 'content_lines') {
+						$_POST['content_lines'] = GETPOST('content_lines-'.$rowid, 'restricthtml');
+					}
+
+					if ($i) {
+						$sql .= ", ";
+					}
+					$sql .= $field."=";
+
+					if (GETPOST($keycode) == '' || (!in_array($keycode, array('langcode', 'position', 'private', 'defaultfortype')) && !GETPOST($keycode))) {
+						$sql .= "null"; // langcode,... must be '' if not defined so the unique key that include lang will work
+					} elseif (GETPOST($keycode) == '0' && $keycode == 'langcode') {
+						$sql .= "''"; // langcode must be '' if not defined so the unique key that include lang will work
+					} elseif ($keycode == 'fk_user') {
+						if (!$user->admin) {	// A non admin user can only edit its own template
+							$sql .= " ".((int) $user->id);
+						} else {
+							$sql .= " ".(GETPOSTINT($keycode));
+						}
+					} elseif ($keycode == 'content') {
+						$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
+					} elseif (in_array($keycode, array('joinfiles', 'defaultfortype', 'private', 'position'))) {
+						$sql .= GETPOSTINT($keycode);
+					} else {
+						$sql .= "'".$db->escape(GETPOST($keycode, 'alphanohtml'))."'";
+					}
+					$i++;
+				}
+
+				$sql .= " WHERE ".$db->escape($rowidcol)." = ".((int) $rowid);
+				if (!$user->admin) {	// A non admin user can only edit its own template
+					$sql .= " AND fk_user  = ".((int) $user->id);
+				}
+				//print $sql;exit;
+				dol_syslog("actionmodify", LOG_DEBUG);
+
+				//print $sql;
+				$resql = $db->query($sql);
+				if (!$resql) {
+					$error++;
+					setEventMessages($db->error(), null, 'errors');
+					$action = 'edit';
+				}
+			}
+
+			if (!$error) {
+				setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+			}
 		}
 	}
 
@@ -1380,7 +1394,7 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '')
 		} elseif ($value == 'fk_user') {
 			print '<td>';
 			if ($user->admin && $context != 'preview') {
-				print $form->select_dolusers(empty($obj->$value) ? '' : $obj->$value, 'fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'minwidth75 maxwidth100');
+				print $form->select_dolusers(GETPOSTISSET('fk_user') ? GETPOSTINT('fk_user') : (empty($obj->$value) ? '' : $obj->$value), 'fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'minwidth75 maxwidth100');
 			} else {
 				if ($context == 'add') {	// I am not admin and we show the add form
 					print $user->getNomUrl(-1); // Me
@@ -1467,10 +1481,10 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '')
 			if ($value == 'private' && $context != 'preview') {
 				if (empty($user->admin)) {
 					// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
-					print $form->selectyesno($value, '1', 1);
+					print $form->selectyesno($value, '1', 1, false, 0, 1);
 				} else {
 					// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
-					print $form->selectyesno($value, (isset($obj->$value) ? $obj->$value : ''), 1);
+					print $form->selectyesno($value, (isset($obj->$value) ? $obj->$value : ''), 1, false, 0, 1);
 				}
 			} else {
 				print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->$value) ? $obj->$value : '').'" name="'. $value .'"'.($context == 'preview' ? ' disabled' : '').'>';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 49aec430b3f..633f78fc182 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -499,7 +499,7 @@ class FormMail extends Form
 
 			$modelmail_array = array();
 			if ($this->param['models'] != 'none') {
-				$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
+				$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);	// Fill $this->lines_model
 				if ($result < 0) {
 					setEventMessages($this->error, $this->errors, 'errors');
 				}
@@ -1604,7 +1604,7 @@ class FormMail extends Form
 			$languagetosearchmain = '';
 		}
 
-		$sql = "SELECT rowid, module, label, type_template, topic, email_from, joinfiles, content, content_lines, lang, email_from, email_to, email_tocc, email_tobcc";
+		$sql = "SELECT rowid, entity, module, label, type_template, topic, email_from, joinfiles, content, content_lines, lang, email_from, email_to, email_tocc, email_tobcc";
 		$sql .= " FROM ".$dbs->prefix().'c_email_templates';
 		$sql .= " WHERE (type_template = '".$dbs->escape($type_template)."' OR type_template = 'all')";
 		$sql .= " AND entity IN (".getEntity('c_email_templates').")";
@@ -1627,6 +1627,7 @@ class FormMail extends Form
 		if ($id == -1) {
 			$sql .= " AND position = 0";
 		}
+		$sql .= " AND entity IN(".getEntity('c_email_templates', 1).")";
 		if ($languagetosearch) {
 			$sql .= $dbs->order("position,lang,label", "ASC,DESC,ASC"); // We want line with lang set first, then with lang null or ''
 		} else {
@@ -1753,7 +1754,7 @@ class FormMail extends Form
 	}
 
 	/**
-	 *      Find if template exists and are available for current user, then set them into $this->lines_module.
+	 *      Find if template exists and are available for current user, then set them into $this->lines_model.
 	 *      Search into table c_email_templates
 	 *
 	 * 		@param	string		$type_template		Get message for key module
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 53313f06e90..6731ceb67e4 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -27,6 +27,7 @@
  * $defaulttopic and $defaulttopiclang
  * $diroutput
  * $arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
+ * $file
  */
 
 // Protection to avoid direct call of template
@@ -134,7 +135,7 @@ if ($action == 'presend') {
 	$formmail = new FormMail($db);
 
 	$formmail->param['langsmodels'] = (empty($newlang) ? $langs->defaultlang : $newlang);
-	$formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (getDolGlobalString('MAIN_MAIL_DEFAULT_FROMTYPE') ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
+	$formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : getDolGlobalString('MAIN_MAIL_DEFAULT_FROMTYPE', 'user'));
 
 	if ($formmail->fromtype === 'user') {
 		$formmail->fromid = $user->id;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 363935d4194..93c3eceb2c4 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2509,3 +2509,4 @@ SendToUrl=Send to Url
 WebsiteTemplateWasCopied=The website template(s) "%s" provided by this module has been saved into the directory of website templates (/doctemplates/websites) and is ready to be imported as a new web site.
 EnabledByDefaultAtInstall=Enabled by default at install
 VulnerableToRCEAttack=You are vulnerable to RCE attacks by using the custom dol_json_decode function
+AnOwnerMustBeSetIfEmailTemplateIsPrivate=An owner must be set if the email template is set as private