diff --git a/workflow/engine/classes/model/map/EmailServerMapBuilder.php b/workflow/engine/classes/model/map/EmailServerMapBuilder.php
index ba474c9dd..d3ceb8f91 100644
--- a/workflow/engine/classes/model/map/EmailServerMapBuilder.php
+++ b/workflow/engine/classes/model/map/EmailServerMapBuilder.php
@@ -79,9 +79,9 @@ class EmailServerMapBuilder
 
         $tMap->addColumn('MESS_PASSWORD', 'MessPassword', 'string', CreoleTypes::VARCHAR, true, 256);
 
-        $tMap->addColumn('MESS_FROM_MAIL', 'MessFromMail', 'string', CreoleTypes::VARCHAR, true, 256);
+        $tMap->addColumn('MESS_FROM_MAIL', 'MessFromMail', 'string', CreoleTypes::VARCHAR, false, 256);
 
-        $tMap->addColumn('MESS_FROM_NAME', 'MessFromName', 'string', CreoleTypes::VARCHAR, true, 256);
+        $tMap->addColumn('MESS_FROM_NAME', 'MessFromName', 'string', CreoleTypes::VARCHAR, false, 256);
 
         $tMap->addColumn('SMTPSECURE', 'Smtpsecure', 'string', CreoleTypes::VARCHAR, true, 3);
 
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 012edebf3..a72dcc672 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -4030,7 +4030,7 @@
         <column name="DEL_DUE_DATE" type="TIMESTAMP" required="false"/>
         <column name="DEL_PRIORITY" type="VARCHAR" size="32" required="true" default="3"/>
         <column name="DEL_THREAD_STATUS" type="VARCHAR" size="32" required="true" default="OPEN"/>
-    </table> 
+    </table>
     <table name="LIST_COMPLETED">
         <vendor type="mysql">
             <parameter name="Name" value="LIST_COMPLETED"/>
@@ -4336,8 +4336,8 @@
         <column name="MESS_RAUTH" type="INTEGER" required="true" default="0" />
         <column name="MESS_ACCOUNT" type="VARCHAR" size="256" required="true" default="" />
         <column name="MESS_PASSWORD" type="VARCHAR" size="256" required="true" default="" />
-        <column name="MESS_FROM_MAIL" type="VARCHAR" size="256" required="true" default="" />
-        <column name="MESS_FROM_NAME" type="VARCHAR" size="256" required="true" default="" />
+        <column name="MESS_FROM_MAIL" type="VARCHAR" size="256" default="" />
+        <column name="MESS_FROM_NAME" type="VARCHAR" size="256" default="" />
         <column name="SMTPSECURE" type="VARCHAR" size="3" required="true" default="No" />
         <column name="MESS_TRY_SEND_INMEDIATLY" type="INTEGER" required="true" default="0" />
         <column name="MAIL_TO" type="VARCHAR" size="256" required="true" default="" />
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 9066d054f..79c15e9d7 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -2483,7 +2483,6 @@ CREATE TABLE `MESSAGE_TYPE_VARIABLE`
 
 DROP TABLE IF EXISTS `EMAIL_SERVER`;
 
-
 CREATE TABLE `EMAIL_SERVER`
 (
 	`MESS_UID` VARCHAR(32) default '' NOT NULL,
@@ -2493,8 +2492,8 @@ CREATE TABLE `EMAIL_SERVER`
 	`MESS_RAUTH` INTEGER default 0 NOT NULL,
 	`MESS_ACCOUNT` VARCHAR(256) default '' NOT NULL,
 	`MESS_PASSWORD` VARCHAR(256) default '' NOT NULL,
-	`MESS_FROM_MAIL` VARCHAR(256) default '' NOT NULL,
-	`MESS_FROM_NAME` VARCHAR(256) default '' NOT NULL,
+	`MESS_FROM_MAIL` VARCHAR(256) default '',
+	`MESS_FROM_NAME` VARCHAR(256) default '',
 	`SMTPSECURE` VARCHAR(3) default 'No' NOT NULL,
 	`MESS_TRY_SEND_INMEDIATLY` INTEGER default 0 NOT NULL,
 	`MAIL_TO` VARCHAR(256) default '' NOT NULL,