diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 88ae8964c1b..08e7c2b5446 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -679,9 +679,10 @@ if ($action == 'edit')
print '
| '.$langs->trans("OtherOptions").' | |
';
// From
- print '| '.$langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ?ini_get('sendmail_from') : $langs->transnoentities("Undefined")).' | ';
+ print '
| '.$langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ?ini_get('sendmail_from') : $langs->transnoentities("Undefined")).' | ';
print ''.$conf->global->MAIN_MAIL_EMAIL_FROM;
- if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && !isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail"));
+ if (empty($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("Mandatory"));
+ elseif (!isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail"));
print ' |
';
// Default from type