diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index d0c829ade..871b7970d 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -2103,6 +2103,7 @@ class XmlForm_Field_Link extends XmlForm_Field {
   var $link         = '';
   var $value        = '';
   var $target       = '';
+  var $style       = '';
   var $colClassName = 'RowLink';
   /**
    * Function render
@@ -2118,7 +2119,7 @@ class XmlForm_Field_Link extends XmlForm_Field {
     $value   = G::replaceDataField ( $this->value, $owner->values );
     $label   = G::replaceDataField ( $this->label, $owner->values );
     if ($this->mode == 'edit'){
-      $html  = '<a class="tableOption" href=\'' . $this->htmlentities ( $link, ENT_QUOTES, 'utf-8' ) . '\'' . 'id="form[' . $this->name . ']" name="form[' . $this->name . ']"' . (($this->onclick) ? ' onclick="' . htmlentities ( $onclick, ENT_QUOTES, 'utf-8' ) . '"' : '') . (($this->target) ? ' target="' . htmlentities ( $target, ENT_QUOTES, 'utf-8' ) . '"' : '') . '>' . $this->htmlentities ( $this->value === '' ? $label : $value, ENT_QUOTES, 'utf-8' ) . '</a>';
+      $html  = '<a class="tableOption" href=\'' . $this->htmlentities ( $link, ENT_QUOTES, 'utf-8' ) . '\'' . 'id="form[' . $this->name . ']" name="form[' . $this->name . ']" style="' . htmlentities ( $this->style, ENT_QUOTES, 'utf-8' ) .'" '. (($this->onclick) ? ' onclick="' . htmlentities ( $onclick, ENT_QUOTES, 'utf-8' ) . '"' : '') . (($this->target) ? ' target="' . htmlentities ( $target, ENT_QUOTES, 'utf-8' ) . '"' : '') . '>' . $this->htmlentities ( $this->value === '' ? $label : $value, ENT_QUOTES, 'utf-8' ) . '</a>';
       $html .= $this->renderHint();
     } else {
       $html  = $this->htmlentities ( $this->value === '' ? $label : $value, ENT_QUOTES, 'utf-8' );
diff --git a/workflow/engine/xmlform/login/login.xml b/workflow/engine/xmlform/login/login.xml
index 464c5e147..4704dacd6 100755
--- a/workflow/engine/xmlform/login/login.xml
+++ b/workflow/engine/xmlform/login/login.xml
@@ -19,17 +19,16 @@
     <en>Login</en>
   </BSUBMIT>
   
-  <FORGOT_PASWORD_LINK type="link" link="forgotPassword" onclick="" colAlign="right" colWidth="135">
+  <FORGOT_PASWORD_LINK type="link" link="forgotPassword" onclick="" colAlign="right" colWidth="135" style="display:none;">
     <en>Forgot Password</en>    
   </FORGOT_PASWORD_LINK>
   
 
 
   <JS type="javascript"><![CDATA[
- 
 // enable/disable forgot password link
-if(flagForgotPassword != 'on' )
-  hideRowById('FORGOT_PASWORD_LINK');
+if(flagForgotPassword == 'on' )
+  document.getElementById("form[FORGOT_PASWORD_LINK]").style.display = 'block';//hideRowById('FORGOT_PASWORD_LINK');
   
 var panel;