diff --git a/workflow/engine/classes/class.spool.php b/workflow/engine/classes/class.spool.php
index 42564ae73..7bcc34485 100755
--- a/workflow/engine/classes/class.spool.php
+++ b/workflow/engine/classes/class.spool.php
@@ -333,7 +333,7 @@ class spoolRun {
           $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
           if (strpos( $passwdDec, 'hash:' ) !== false) {
     	      list($hash, $pass) = explode(":", $passwdDec);   
-    	      $passwd = $pass;
+    	      $this->config['MESS_PASSWORD'] = $pass;
           }
           $oPHPMailer->Password = $this->config['MESS_PASSWORD'];
           $oPHPMailer->From = $this->fileData['from_email'];
@@ -387,7 +387,7 @@ class spoolRun {
           $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
           if (strpos( $passwdDec, 'hash:' ) !== false) {
     	      list($hash, $pass) = explode(":", $passwdDec);   
-    	      $passwd = $pass;
+    	      $this->config['MESS_PASSWORD'] = $pass;
           }
           $oPHPMailer->Password = $this->config['MESS_PASSWORD'];
           $oPHPMailer->From = $this->fileData['from_email'];
@@ -473,7 +473,7 @@ class spoolRun {
           $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
           if (strpos( $passwdDec, 'hash:' ) !== false) {
     	      list($hash, $pass) = explode(":", $passwdDec);   
-    	      $passwd = $pass;
+    	      $this->config['MESS_PASSWORD'] = $pass;
           }
           $send->setPassword($this->config['MESS_PASSWORD']);
           $send->setReturnPath($this->fileData['from_email']);
@@ -507,7 +507,7 @@ class spoolRun {
     $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');    
     if (strpos( $passwdDec, 'hash:' ) !== false) {
       list($hash, $pass) = explode(":", $passwdDec);   
-      $passwd = $pass;
+      $this->config['MESS_PASSWORD'] = $pass;
     }
     if( $aConfiguration['MESS_ENABLED'] == '1' ) {
       $this->setConfig(array (
diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index 2c16b9817..ce3abea91 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -631,7 +631,7 @@ class wsBase
       $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
       if (strpos( $passwdDec, 'hash:' ) !== false) {
     	  list($hash, $pass) = explode(":", $passwdDec);   
-    	  $passwd = $pass;
+    	  $arrayFrom['MESS_PASSWORD'] = $pass;
       }       
       $oSpool = new spoolRun();
       $oSpool->setConfig(array(
diff --git a/workflow/engine/classes/class.xpdl.php b/workflow/engine/classes/class.xpdl.php
index 226fc6510..a1758bea7 100755
--- a/workflow/engine/classes/class.xpdl.php
+++ b/workflow/engine/classes/class.xpdl.php
@@ -728,7 +728,7 @@ class Xpdl extends processes
         $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
         if (strpos( $passwdDec, 'hash:' ) !== false) {
     	    list($hash, $pass) = explode(":", $passwdDec);
-    	    $passwd = $pass;
+    	    $arrayFrom['MESS_PASSWORD'] = $pass;
         }
         $from = $arrayFrom['MESS_ACCOUNT'];
         if($to == 'ext'){
diff --git a/workflow/engine/classes/model/AppNotes.php b/workflow/engine/classes/model/AppNotes.php
index 5633af31c..ba42c4e5f 100755
--- a/workflow/engine/classes/model/AppNotes.php
+++ b/workflow/engine/classes/model/AppNotes.php
@@ -146,7 +146,7 @@ class AppNotes extends BaseAppNotes {
           $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
           if (strpos( $passwdDec, 'hash:' ) !== false) {
     	      list($hash, $pass) = explode(":", $passwdDec);   
-    	      $passwd = $pass;
+    	      $aConfiguration['MESS_PASSWORD'] = $pass;
           }
         } else {
           $aConfiguration = array();
diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index bb0bd624e..6b466d74f 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -222,7 +222,7 @@ class adminProxy extends HttpProxyController
     
     if (strpos( $passwdDec, 'hash:' ) !== false) {
       list($hash, $pass) = explode(":", $passwdDec);   
-      $passwd = $pass;
+      $_POST['passwd'] = $pass;
     }
     
     $port = $_POST['port'];
@@ -548,8 +548,14 @@ class adminProxy extends HttpProxyController
     $oConfiguration = new Configurations();      
     $oConfiguration->loadConfig($x, 'Emails','','','','');
     $fields = $oConfiguration->aConfig;
-    $this->success = (count($fields) > 0);
-    $this->data = $fields;    
+    $this->success = (count($fields) > 0);    
+    $passwd = $fields['MESS_PASSWORD'];
+    $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
+    if (strpos( $passwdDec, 'hash:' ) !== false) {
+      list($hash, $pass) = explode(":", $passwdDec);   
+      $fields['MESS_PASSWORD'] = $pass;
+    }   
+    $this->data = $fields;
   }
 
   /**
diff --git a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
index e4e1fb318..b8d91b71c 100644
--- a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
+++ b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
@@ -154,7 +154,7 @@
     $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
     if (strpos( $passwdDec, 'hash:' ) !== false) {
     	list($hash, $pass) = explode(":", $passwdDec);   
-    	$passwd = $pass;
+    	$aConfiguration['MESS_PASSWORD'] = $pass;
     }
     
     
diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php
index c661511d0..390dfbc84 100755
--- a/workflow/engine/methods/cases/cases_Ajax.php
+++ b/workflow/engine/methods/cases/cases_Ajax.php
@@ -772,6 +772,12 @@ switch(($_POST['action'])?$_POST['action']:$_REQUEST['action']) {
 			'MESS_PASSWORD'	=>	$aConfiguration['MESS_PASSWORD'],
 			'SMTPAuth'		=>	$aConfiguration['MESS_RAUTH']
 		));
+		$passwd = $oSpool['MESS_PASSWORD'];
+    $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
+    if (strpos( $passwdDec, 'hash:' ) !== false) {
+    	list($hash, $pass) = explode(":", $passwdDec);   
+    	$oSpool['MESS_PASSWORD'] = $pass;
+    }
 
 		$oSpool->create(array(
 			'msg_uid'		=>	$data['MSG_UID'],
diff --git a/workflow/engine/methods/login/retrivePassword.php b/workflow/engine/methods/login/retrivePassword.php
index 0533f8cc0..5cb7135d3 100755
--- a/workflow/engine/methods/login/retrivePassword.php
+++ b/workflow/engine/methods/login/retrivePassword.php
@@ -65,6 +65,12 @@ if($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL']
     'SMTPAuth'      => $aSetup['MESS_RAUTH'],
     'SMTPSecure'    => $aSetup['SMTPSecure']
   ));
+  $passwd = $oSpool['MESS_PASSWORD'];
+    $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
+    if (strpos( $passwdDec, 'hash:' ) !== false) {
+    	list($hash, $pass) = explode(":", $passwdDec);   
+    	$oSpool['MESS_PASSWORD'] = $pass;
+    }
   
   $oSpool->create(array(
     'msg_uid'          => '',
diff --git a/workflow/engine/methods/setup/emails_Ajax.php b/workflow/engine/methods/setup/emails_Ajax.php
index fc4888d91..18e4211c5 100755
--- a/workflow/engine/methods/setup/emails_Ajax.php
+++ b/workflow/engine/methods/setup/emails_Ajax.php
@@ -76,7 +76,7 @@ switch ($request) {
     $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
     if (strpos( $passwdDec, 'hash:' ) !== false) {
     	list($hash, $pass) = explode(":", $passwdDec);   
-    	$passwd = $pass;
+    	$_POST['passwd'] = $pass;
     }
     $step  = $_POST['step'];
     $auth_required  = $_POST['auth_required'];
diff --git a/workflow/engine/templates/admin/emails.js b/workflow/engine/templates/admin/emails.js
index cdb5b46c1..c195270c5 100644
--- a/workflow/engine/templates/admin/emails.js
+++ b/workflow/engine/templates/admin/emails.js
@@ -276,8 +276,7 @@ Ext.onReady(function(){
           Ext.getCmp('RequireAuthentication').setValue(res.data.MESS_RAUTH);
           Ext.getCmp('AccountFrom').setValue(res.data.MESS_ACCOUNT);
           Ext.getCmp('Password').setValue(res.data.MESS_PASSWORD);
-	  Ext.getCmp('PasswordHide').setValue(Ext.getCmp('Password').getValue());
-	  Ext.getCmp('Password').setValue('');
+					Ext.getCmp('PasswordHide').setValue(Ext.getCmp('Password').getValue());				 
           Ext.getCmp('SendaTestMail').setValue(res.data.MESS_TRY_SEND_INMEDIATLY);          
           
 	  if(!res.data.MAIL_TO) {
@@ -587,8 +586,7 @@ saveMethod=function() {
     },
     success: function(r){
       var i = Ext.decode(r.responseText); 
-      PMExt.notify(_('ID_CHANGES_SAVED'),i.msg);
-      Ext.getCmp('Password').setValue('');
+      PMExt.notify(_('ID_CHANGES_SAVED'),i.msg); 
     }
   });
 }
\ No newline at end of file