diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 609d4e02f..3459fbb0c 100755
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -3365,7 +3365,13 @@ $output = $outputHeader.$output;
     if (!$setup['MESS_ENABLED']) {
       return G::LoadTranslation('ID_EMAIL_ENGINE_IS_NOT_ENABLED');
     }
-    
+
+    $passwd    = $setup['MESS_PASSWORD'];
+    $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
+    if (strpos( $passwdDec, 'hash:' ) !== false) {
+      list($hash, $pass) = explode(":", $passwdDec);
+      $setup['MESS_PASSWORD'] = $pass;
+    }
     $mail = new PHPMailer(true);
     $mail->From = $from != '' && $from ? $from : $setup['MESS_ACCOUNT'];
     $mail->FromName = $fromName;
diff --git a/workflow/engine/xmlform/login/login.xml b/workflow/engine/xmlform/login/login.xml
index 59870f70d..ab37b9d61 100755
--- a/workflow/engine/xmlform/login/login.xml
+++ b/workflow/engine/xmlform/login/login.xml
@@ -27,7 +27,7 @@
 
   <JS type="javascript"><![CDATA[
 // enable/disable forgot password link
-if(flagForgotPassword == 'on' )
+if(flagForgotPassword == 'on' || flagForgotPassword == '1')
   document.getElementById("form[FORGOT_PASWORD_LINK]").style.display = 'block';//hideRowById('FORGOT_PASWORD_LINK');
   
 var panel;