diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 58f1dcff7c5..0457f626638 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -275,6 +275,7 @@ else
 		  $formmail = new FormMail($db);	    
 		  $formmail->fromname = $conf->global->MAIN_MAIL_EMAIL_FROM;
 		  $formmail->frommail = $conf->global->MAIN_MAIL_EMAIL_FROM;
+		  $formmail->withfromreadonly=0;
 		  $formmail->withsubstit=0;
 		  $formmail->withfrom=1;
 		  $formmail->witherrorsto=1;
diff --git a/htdocs/html.formmail.class.php b/htdocs/html.formmail.class.php
index aa8ec32665c..5900c801539 100644
--- a/htdocs/html.formmail.class.php
+++ b/htdocs/html.formmail.class.php
@@ -214,6 +214,14 @@ class FormMail
 				print "</td></tr>\n";
 				print "</td></tr>\n";
 			}
+			else
+			{
+				print "<tr><td>".$langs->trans("MailFrom")."</td><td>";
+				print $langs->trans("Name").':<input type="text" name="fromname" size="32" value="'.$this->fromname.'">';
+				print '&nbsp; &nbsp; ';
+				print $langs->trans("EMail").':&lt;<input type="text" name="frommail" size="32" value="'.$this->frommail.'">&gt;';
+				print "</td></tr>\n";
+			}
 		}
 	
 		// Replyto