diff --git a/workflow/engine/classes/class.Installer.php b/workflow/engine/classes/class.Installer.php
index 129cfb047..9422a27d9 100755
--- a/workflow/engine/classes/class.Installer.php
+++ b/workflow/engine/classes/class.Installer.php
@@ -234,7 +234,8 @@ class Installer
             $this->setPartner();
             $this->setAdmin();
 
-            $querySql = ("INSERT INTO EMAIL_SERVER(MESS_ENGINE) VALUES('MAIL')");
+            $querySql = "INSERT INTO EMAIL_SERVER(MESS_UID, MESS_ENGINE) VALUES('" . \ProcessMaker\Util\Common::generateUID() . "', 'MAIL')";
+
             $this->run_query($querySql);
         }
         return $test;
diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php
index 94ca9e598..fb053ae42 100644
--- a/workflow/engine/controllers/installer.php
+++ b/workflow/engine/controllers/installer.php
@@ -836,7 +836,7 @@ class Installer extends Controller
                 ) ) ) . "'
                            )" );
 
-                $this->mysqlQuery("INSERT INTO EMAIL_SERVER(MESS_ENGINE) VALUES('MAIL')");
+                $this->mysqlQuery("INSERT INTO EMAIL_SERVER(MESS_UID, MESS_ENGINE) VALUES('" . \ProcessMaker\Util\Common::generateUID() . "', 'MAIL')");
             }
 
             // Change admin user
@@ -1143,7 +1143,7 @@ class Installer extends Controller
                 ) ) ) . "'
                            )" );
 
-                $this->mssqlQuery("INSERT INTO EMAIL_SERVER(MESS_ENGINE) VALUES('MAIL')");
+                $this->mssqlQuery("INSERT INTO EMAIL_SERVER(MESS_UID, MESS_ENGINE) VALUES('" . \ProcessMaker\Util\Common::generateUID() . "','MAIL')");
             }
 
             //change admin user