diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php
index c3023828c..7ee62761d 100755
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -320,7 +320,11 @@ try {
         }
         $aFields['DESCRIPTION'] .= '<br />' . G::LoadTranslation('ID_PLEASE_CHANGE_PASSWORD_POLICY') . '<br /><br /></span>';
         $G_PUBLISH = new Publisher;
-        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/changePassword', '', $aFields, 'changePassword');
+        if(SYS_SKIN == 'neoclassic'){
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/changePasswordpm3', '', $aFields, 'changePassword');
+        }else{
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/changePassword', '', $aFields, 'changePassword');
+        }
         G::RenderPage('publish');
         die;
     }
diff --git a/workflow/engine/templates/authSources/authSourcesEdit.js b/workflow/engine/templates/authSources/authSourcesEdit.js
index 76e845dbd..6878e847e 100644
--- a/workflow/engine/templates/authSources/authSourcesEdit.js
+++ b/workflow/engine/templates/authSources/authSourcesEdit.js
@@ -327,7 +327,12 @@ Ext.onReady(function(){
               Ext.Msg.alert('Failure', 'Server reported:'+a.response.status+' '+a.response.statusText);
           }
           if (a.failureType === Ext.form.Action.SERVER_INVALID){
-              Ext.Msg.alert('Warning', 'you have an error');
+            if(Ext.isIE){
+                success = true;
+                window.location = 'authSources_List';
+            }else{
+                Ext.Msg.alert( _('ID_WARNING'), _('ID_YOU_HAVE_ERROR') );
+            }              
           }
       }
     });
diff --git a/workflow/engine/templates/authSources/authSourceskindof.js b/workflow/engine/templates/authSources/authSourceskindof.js
index c26745472..46dd0b4eb 100644
--- a/workflow/engine/templates/authSources/authSourceskindof.js
+++ b/workflow/engine/templates/authSources/authSourceskindof.js
@@ -351,7 +351,12 @@ Ext.onReady(function(){
               Ext.Msg.alert(_('ID_FAILURE'),  _('ID_SERVER_REPORTED') + ':'+a.response.status+' '+a.response.statusText);
           }
           if (a.failureType === Ext.form.Action.SERVER_INVALID){
-              Ext.Msg.alert( _('ID_WARNING'), _('ID_YOU_HAVE_ERROR') );
+            if(Ext.isIE){
+                success = true;
+                window.location = 'authSources_List';
+            }else{
+                Ext.Msg.alert( _('ID_WARNING'), _('ID_YOU_HAVE_ERROR') );
+            } 
           }
       }
     });
diff --git a/workflow/engine/xmlform/login/changePasswordpm3.html b/workflow/engine/xmlform/login/changePasswordpm3.html
new file mode 100644
index 000000000..ecbc54b0a
--- /dev/null
+++ b/workflow/engine/xmlform/login/changePasswordpm3.html
@@ -0,0 +1,47 @@
+<form accept-charset="UTF-8" role="form" class="form-signin" id="{$form_id}" id="{$form_id}" name="{$form_name}" action="{$form_action}"  method="post" encType="multipart/form-data" style="margin:0px;" onsubmit="return validateForm('{$form_objectRequiredFields}');">     
+      <div class="boxTop"><div class="a">&nbsp;</div><div class="b">&nbsp;</div><div class="c">&nbsp;</div></div>
+
+     <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}" />
+
+    <fieldset>
+      <label class="panel-login">          
+        <div class="login_result">
+          {$form.THETITLE}
+          {$form.THEDESCRIPTION}
+        </div>
+      </label>
+     {$form.USR_PASSWORD}     
+     {$form.USR_PASSWORD_CONFIRM}      
+    </fieldset>
+    <fieldset>
+        <label class="panel-login">
+            <div class="login_result"></div>
+        </label>
+        {$form.btnSave}
+        <br>
+        <table>
+          <tr style="display: none">
+              <td colspan="2">{$form.PPP_MINIMUN_LENGTH}</td>
+            </tr>
+                                                <tr style="display: none">
+              <td colspan="2">{$form.PPP_MAXIMUN_LENGTH}</td>
+            </tr>
+                                                <tr style="display: none">
+              <td colspan="2">{$form.PPP_NUMERICAL_CHARACTER_REQUIRED}</td>
+            </tr>
+                                                <tr style="display: none">
+              <td colspan="2">{$form.PPP_UPPERCASE_CHARACTER_REQUIRED}</td>
+            </tr>
+                                                <tr style="display: none">
+              <td colspan="2">{$form.PPP_SPECIAL_CHARACTER_REQUIRED}</td>
+            </tr>
+       </table>   
+    </fieldset>
+    <script type="text/javascript">      
+      {$form.JS}
+    </script>
+</form>
+<script src="/lib/pmdynaform/libs/respondjs/respond.min.js"></script>
+<script src="/lib/pmdynaform/libs/html5shiv/html5shiv.js"></script>
\ No newline at end of file
diff --git a/workflow/engine/xmlform/login/changePasswordpm3.xml b/workflow/engine/xmlform/login/changePasswordpm3.xml
new file mode 100644
index 000000000..50945f886
--- /dev/null
+++ b/workflow/engine/xmlform/login/changePasswordpm3.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dynaForm name="changePassword" xmlform_type="NORMAL" width="400px" enabletemplate="1">
+  <THETITLE type="title">
+    <en><![CDATA[Change password]]></en>
+  </THETITLE>
+  <DESCRIPTION type="private"/>
+  <THEDESCRIPTION type="title" label="@#DESCRIPTION" enableHtml="1">
+    <en><![CDATA[@#DESCRIPTION]]></en>
+  </THEDESCRIPTION>
+  <USR_PASSWORD type="password" size="30" maxlength="32">
+    <en><![CDATA[Password]]></en>
+  </USR_PASSWORD>
+  <USR_PASSWORD_CONFIRM type="password" size="30" maxlength="32">
+    <en><![CDATA[Re-Type Password]]></en>
+  </USR_PASSWORD_CONFIRM>
+  <btnSave type="button" onclick="verifyPassword();">
+    <en><![CDATA[Save]]></en>
+  </btnSave>
+  <PPP_MINIMUN_LENGTH type="hidden"/>
+  <PPP_MAXIMUN_LENGTH type="hidden"/>
+  <PPP_NUMERICAL_CHARACTER_REQUIRED type="hidden"/>
+  <PPP_UPPERCASE_CHARACTER_REQUIRED type="hidden"/>
+  <PPP_SPECIAL_CHARACTER_REQUIRED type="hidden"/>
+  <JS type="javascript"><![CDATA[
+
+  window.onload= function(){
+    var inputUser,inputEmail;
+    if(document.getElementById('form[btnSave]').classList == undefined){    
+      document.getElementById('form[btnSave]').className = "button-login-success";   
+      inputPw = document.getElementById('form[USR_PASSWORD]');
+      inputPwConfirm = document.getElementById('form[USR_PASSWORD_CONFIRM]');
+
+      inputPw.attachEvent("onclick", function (){
+      if(_('ID_PASSWORD') == inputPw.value){
+          inputPw.value="";
+        }        
+      });
+      
+      inputPw.attachEvent("onblur", function (){
+        if(inputPw.value == ""){
+          inputPw.value=_('ID_PASSWORD');
+        }        
+      });
+
+      inputPwConfirm.attachEvent("onclick", function (){
+      if(_('ID_PASSWORD_CONFIRM') == inputPwConfirm.value){
+          inputPwConfirm.value="";
+        }        
+      });
+      
+      inputPwConfirm.attachEvent("onblur", function (){
+        if(inputPwConfirm.value == ""){
+          inputPwConfirm.value=_('ID_PASSWORD_CONFIRM');
+        }        
+      });
+
+    }else{  
+      document.getElementById('form[btnSave]').classList.remove('module_app_button___gray');
+      document.getElementById('form[btnSave]').classList.add('button-login-success');
+      document.getElementById('form[USR_PASSWORD]').placeholder = _('ID_PASSWORD');
+      document.getElementById('form[USR_PASSWORD_CONFIRM]').placeholder = _('ID_PASSWORD_CONFIRM');
+    }
+};
+
+var verifyPassword = function() {
+  var oPassword1 = getField('USR_PASSWORD');
+  var oPassword2 = getField('USR_PASSWORD_CONFIRM');
+  if (oPassword1.value != oPassword2.value) {
+    alert('@G::LoadTranslation(ID_NEW_PASS_SAME_OLD_PASS)');
+    return;
+  }
+  var oAux = getField('PPP_MINIMUN_LENGTH');
+  if (oAux.value != '') {
+    if (oPassword1.value.length < parseInt(oAux.value)) {
+      alert('@G::LoadTranslation(ID_PPP_MINIMUN_LENGTH)' + ': ' + oAux.value);
+      return;
+    }
+  }
+  var oAux = getField('PPP_MAXIMUN_LENGTH');
+  if (oAux.value != '') {
+    if (oPassword1.value.length > parseInt(oAux.value)) {
+      alert('@G::LoadTranslation(ID_PPP_MAXIMUN_LENGTH)' + ': ' + oAux.value);
+      return;
+    }
+  }
+  var oAux = getField('PPP_NUMERICAL_CHARACTER_REQUIRED');
+  if (oAux.value != '') {
+    var sER = /[0-9]/;
+    if (!sER.test(oPassword1.value)) {
+      alert('@G::LoadTranslation(ID_PPP_NUMERICAL_CHARACTER_REQUIRED)');
+      return;
+    }
+  }
+  var oAux = getField('PPP_UPPERCASE_CHARACTER_REQUIRED');
+  if (oAux.value != '') {
+    var sER = /[A-Z]/;
+    if (!sER.test(oPassword1.value)) {
+      alert('@G::LoadTranslation(ID_PPP_UPPERCASE_CHARACTER_REQUIRED)');
+      return;
+    }
+  }
+  var oAux = getField('PPP_SPECIAL_CHARACTER_REQUIRED');
+  if (oAux.value != '') {
+    var sER = /[ºª\\!|"@·#$~%€&¬\/()=\'?¡¿*+\-_.:,;]/;
+    if (!sER.test(oPassword1.value)) {
+      alert('@G::LoadTranslation(ID_PPP_SPECIAL_CHARACTER_REQUIRED)');
+      return;
+    }
+  }
+  oPassword1.form.submit();
+};
+
+]]></JS>
+</dynaForm>