diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index db0f19773..a3e748df9 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -374,8 +374,8 @@ class adminProxy extends HttpProxyController
             define("FAILED", 'FAILED');
             $mail_to                = $_POST['mail_to'];
             $send_test_mail         = $_POST['send_test_mail'];
-            $_POST['FROM_NAME']     = G::LoadTranslation("ID_MESS_TEST_BODY");
             $_POST['FROM_EMAIL']    = ($_POST["from_mail"] != "" && preg_match($eregMail, $_POST["from_mail"]))? $_POST["from_mail"] : "";
+            $_POST['FROM_NAME']     = $_POST["from_name"] != "" ? $_POST["from_name"] : G::LoadTranslation("ID_MESS_TEST_BODY");
             $_POST['MESS_ENGINE']   = 'MAIL';
             $_POST['MESS_SERVER']   = 'localhost';
             $_POST['MESS_PORT']     = 25;
diff --git a/workflow/engine/templates/admin/emails.js b/workflow/engine/templates/admin/emails.js
index ac85dd1ec..438c8d4ce 100644
--- a/workflow/engine/templates/admin/emails.js
+++ b/workflow/engine/templates/admin/emails.js
@@ -376,9 +376,10 @@ Ext.onReady(function(){
         xtype:      "textfield",
         id:         "fromMail",
         name:       "fromMail",
-        fieldLabel: "From Mail",  //"From Mail",
+        fieldLabel: _('ID_FROM_EMAIL'),  //"From Mail",
         width:      250,
-        disabled:   true
+        disabled:   true,
+        vtype:'email'
       },
       {
         xtype: 'textfield',
@@ -849,7 +850,8 @@ var testMethod = function()
         request   : 'mailTestMail_Show',
         mail_to   : 'admin@processmaker.com',
         send_test_mail  : 'yes',
-        from_mail : Ext.getCmp("fromMail").getValue()
+        from_mail : Ext.getCmp("fromMail").getValue(),
+        from_name : Ext.getCmp("eFromName").getValue()
       };
 
       Ext.getCmp('step11').setText('<span id="rstep11"></span>  '+_('LOGIN_VERIFY_MSG')+' <b> Mail Transport Agent </b>', false);