diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml
index 5cd64dd19..6c046ca72 100755
--- a/workflow/engine/xmlform/login/forgotPasswordpm3.xml
+++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml
@@ -3,10 +3,10 @@
   <TITLE type="title">
     <en><![CDATA[I forgot my password]]></en>
   </TITLE>
-  <USR_USERNAME type="text" size="30" maxlength="50" required="true" validate="Any">
+  <USR_USERNAME type="text" size="30" maxlength="50" required="true" validate="Any" autocomplete="0">
     <en><![CDATA[User]]></en>
   </USR_USERNAME>
-  <USR_EMAIL type="text" size="30" required="true" maxlength="32">
+  <USR_EMAIL type="text" size="30" required="true" maxlength="32"  autocomplete="0">
     <en><![CDATA[Email]]></en>
   </USR_EMAIL>
   <URL type="hidden"/>
diff --git a/workflow/engine/xmlform/login/loginpm3.html b/workflow/engine/xmlform/login/loginpm3.html
index 6a38dc9b3..95e292ce3 100755
--- a/workflow/engine/xmlform/login/loginpm3.html
+++ b/workflow/engine/xmlform/login/loginpm3.html
@@ -46,13 +46,13 @@
   id="{$form_id}" name="{$form_name}" action="{$form_action}" method="post" encType="multipart/form-data" onsubmit="return validateForm('{$form_objectRequiredFields}');">
   <input type="hidden" class="notValidateThisFields" name="__notValidateThisFields__" id="__notValidateThisFields__" value="{$form_objectRequiredFields}" />
   <input type="hidden" name="DynaformRequiredFields" id="DynaformRequiredFields" value="{$form_objectRequiredFields}" />
-  
+    <div style="display: none;"> {$form.USR_PASSWORD}</div>
     <fieldset>
       <label class="panel-login">
         <div class="login_result"></div>
       </label>
       {$form.USR_USERNAME}
-      {$form.USR_PASSWORD}
+      {$form.USR_PASSWORD_MASK}
       {$form.USER_LANG}
       {$form.URL}
       
diff --git a/workflow/engine/xmlform/login/loginpm3.xml b/workflow/engine/xmlform/login/loginpm3.xml
index a12b154d4..5a27ec84e 100755
--- a/workflow/engine/xmlform/login/loginpm3.xml
+++ b/workflow/engine/xmlform/login/loginpm3.xml
@@ -3,19 +3,22 @@
   <TITLE type="title">
     <en><![CDATA[Login]]></en>
   </TITLE>
-  <USR_USERNAME type="text" size="30" maxlength="50" validate="Any">
+<USR_USERNAME type="text" size="30" maxlength="50" validate="Any" autocomplete="0">
     <en><![CDATA[User]]></en>
   </USR_USERNAME>
-  <USR_PASSWORD type="password" size="30" maxlength="32" autocomplete="0">
+  <USR_PASSWORD type="text" size="30" maxlength="32" autocomplete="0">
     <en><![CDATA[Password]]></en>
   </USR_PASSWORD>
+  <USR_PASSWORD_MASK type="password" size="30" maxlength="32" autocomplete="0">
+    <en><![CDATA[Password]]></en>
+  </USR_PASSWORD_MASK>
   <USER_LANG type="dropdown" sqlconnection="dbarray">
 SELECT LANG_ID, LANG_NAME FROM langOptions
   <en><![CDATA[Language]]></en>
 </USER_LANG>
   <URL type="hidden"/>
   <LOGIN_VERIFY_MSG type="private" showInTable="0"/>
-  <BSUBMIT type="submit">
+  <BSUBMIT type="button">
     <en><![CDATA[Login]]></en>
   </BSUBMIT>
   <FORGOT_PASWORD_LINK type="link" link="forgotPassword" onclick="" colAlign="right" colWidth="135" style="display:none;">
@@ -25,7 +28,7 @@ SELECT LANG_ID, LANG_NAME FROM langOptions
 
 window.onload= function(){   
   document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER');
-  document.getElementById('form[USR_PASSWORD]').placeholder = _('ID_PASSWORD');
+  document.getElementById('form[USR_PASSWORD_MASK]').placeholder = _('ID_PASSWORD');
 };
 
 // enable/disable forgot password link
@@ -98,6 +101,11 @@ leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function()
   if (client.browser != "firefox") {
     document.login.submit();
   }
+   document.getElementById('form[USR_PASSWORD]').value = document.getElementById('form[USR_PASSWORD_MASK]').value;
+   document.getElementById('form[USR_PASSWORD_MASK]').value = '';
+   document.getElementById('form[USR_PASSWORD_MASK]').setAttribute('type', 'text');
+   document.login.submit();
+  //return true;
 }.extend(document.getElementById('form[BSUBMIT]')));
 
 ]]></JS>
diff --git a/workflow/engine/xmlform/login/sysLoginNoWSpm3.html b/workflow/engine/xmlform/login/sysLoginNoWSpm3.html
index bd8dda6f6..dca2ff902 100644
--- a/workflow/engine/xmlform/login/sysLoginNoWSpm3.html
+++ b/workflow/engine/xmlform/login/sysLoginNoWSpm3.html
@@ -46,12 +46,13 @@
     <input type="hidden" class="notValidateThisFields" name="__notValidateThisFields__" id="__notValidateThisFields__" value="{$form_objectRequiredFields}" />
     <input type="hidden" name="DynaformRequiredFields" id="DynaformRequiredFields" value="{$form_objectRequiredFields}" />
     <input type="hidden" name="__DynaformName__" id="__DynaformName__" value="{$form_name}" />
+    <div style="display: none;"> {$form.USR_PASSWORD}</div>
     <fieldset>
       <label class="panel-login">
         <div class="login_result"></div>
       </label>
       {$form.USR_USERNAME}
-      {$form.USR_PASSWORD}    
+      {$form.USR_PASSWORD_MASK}    
       
     </fieldset>
     <fieldset>
diff --git a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml
index 93b382609..c152669c6 100755
--- a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml
+++ b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml
@@ -3,27 +3,30 @@
   <TITLE type="title">
     <en><![CDATA[Login]]></en>
   </TITLE>
-  <USR_USERNAME type="text" size="30" maxlength="50" validate="Any">
+  <USR_USERNAME type="text" size="30" maxlength="50" validate="Any" autocomplete="0">
     <en><![CDATA[User]]></en>
   </USR_USERNAME>
-  <USR_PASSWORD type="password" size="30" maxlength="32" autocomplete="0">
+  <USR_PASSWORD type="hidden" size="30" maxlength="32" autocomplete="0">
     <en><![CDATA[Password]]></en>
   </USR_PASSWORD>
-  <USER_ENV type="text" size="30" maxlength="50">
+  <USR_PASSWORD_MASK type="password" size="30" maxlength="32" autocomplete="0">
+    <en><![CDATA[Password]]></en>
+  </USR_PASSWORD_MASK>
+  <USER_ENV type="text" size="30" maxlength="50" autocomplete="0">
     <en><![CDATA[Workspace]]></en>
   </USER_ENV>
   <USER_LANG type="dropdown" sqlconnection="dbarray">
 SELECT LANG_ID, LANG_NAME FROM langOptions
 <en><![CDATA[Language]]></en>
 </USER_LANG>
-  <BSUBMIT type="submit">
+  <BSUBMIT type="button">
     <en><![CDATA[Login]]></en>
   </BSUBMIT>
   <JS type="javascript"><![CDATA[
 
 window.onload= function(){  
   document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER');
-  document.getElementById('form[USR_PASSWORD]').placeholder = _('ID_PASSWORD');
+  document.getElementById('form[USR_PASSWORD_MASK]').placeholder = _('ID_PASSWORD');
   document.getElementById('form[USER_ENV]').placeholder = _('ID_WORKSPACE');  
 };
 
@@ -37,6 +40,10 @@ leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function()
     if (client.browser == "msie" || client.browser == "safari"){
         document.sysLogin.submit();
     }
+    document.getElementById('form[USR_PASSWORD]').value = document.getElementById('form[USR_PASSWORD_MASK]').value;
+    document.getElementById('form[USR_PASSWORD_MASK]').value = '';
+    document.getElementById('form[USR_PASSWORD_MASK]').setAttribute('type', 'text');
+    document.sysLogin.submit();
 }.extend(document.getElementById('form[BSUBMIT]')));
 
 try{