diff --git a/workflow/engine/xmlform/login/forgotPassword.xml b/workflow/engine/xmlform/login/forgotPassword.xml
index aced56950..98b05250b 100644
--- a/workflow/engine/xmlform/login/forgotPassword.xml
+++ b/workflow/engine/xmlform/login/forgotPassword.xml
@@ -17,37 +17,6 @@
   <JS type="javascript"><![CDATA[
 var panel;
 
-function processHbInfo(){
-  ajax_server="../services/processHeartBeat_Ajax.php";
-  parameters="action=processInformation";
-  method="POST";
-  callback="";
-  asynchronous=true;
-  ajax_post(ajax_server, parameters, method, callback, asynchronous );
-};
-
-function showGettingStarted () {
-  panel = new leimnud.module.panel();
-  panel.options={
-    size  :{w:620,h:500},
-    position:{x:50,y:50,center:true},
-    control :{close:true,resize:false},fx:{modal:true},
-    statusBar:false,
-    fx  :{shadow:true,modal:true}
-  };
-  panel.make();
-  panel.loader.show();
-  var r = new leimnud.module.rpc.xmlhttp({
-    url:"../services/login_getStarted.php",
-    method:"POST"
-  });
-  r.callback=function(rpc) {
-    panel.loader.hide();
-    panel.addContent(rpc.xmlhttp.responseText);
-  };
-  r.make();
-};
-
 var saveConfig = function() {
   if(document.getElementById("getStarted").checked==true) {
     var oRPC = new leimnud.module.rpc.xmlhttp({
@@ -63,60 +32,8 @@ var saveConfig = function() {
 
 var dynaformOnload = function() {
   setFocus (getField ('USR_USERNAME'));  
-  if (flagHeartBeat) processHbInfo();
-  if (flagGettingStarted) showGettingStarted();
 };
 
-var openInfoPanel = function() {
-  var oInfoPanel = new leimnud.module.panel();
-  oInfoPanel.options = {
-    size    :{w:500,h:424},
-    position:{x:0,y:0,center:true},
-    title   :'System Information',
-    theme   :'processmaker',
-    control :{
-      close :true,
-      drag  :false
-    },
-    fx:{
-      modal:true
-    }
-  };
-  oInfoPanel.setStyle = {modal: {
-    backgroundColor: 'white'
-  }};
-  oInfoPanel.make();
-  var oRPC = new leimnud.module.rpc.xmlhttp({
-    url   : '../login/dbInfo',
-    async : false,
-    method: 'POST',
-    args  : ''
-  });
-  oRPC.make();
-  oInfoPanel.addContent(oRPC.xmlhttp.responseText);
-};
-
-leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() { 
-  setNestedProperty(this, Array('disabled'), 'true');
-  setNestedProperty(this, Array('value'), @@LOGIN_VERIFY_MSG);
-  lang = getField('USER_LANG').value;
-  createCookie('pmos_generik', '{"lang":"'+lang+'"}', 365);
-    
-  var client = getBrowserClient();
-    
-  if (client.browser != "firefox"){ 
-    document.login.submit();
-  } 
-}.extend(document.getElementById('form[BSUBMIT]'))); 
-  
-try{
-  c = new String(readCookie('pmos_generik'));
-  o = eval("("+c+")");
-  if( o != null){
-    getField('USER_LANG').value = o.lang; 
-  }
-} 
-catch(e){}
 
 ]]></JS>
 
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index b390b6286..574bcf74c 100644
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -588,6 +588,8 @@ $startingTime =  array_sum(explode(' ',microtime()));
       and  SYS_TARGET != 'autoinstallPlugins'
       and  SYS_TARGET != 'heartbeatStatus'
       and  SYS_TARGET != 'showLogoFile'
+      and  SYS_TARGET != 'forgotPassword'
+      and  SYS_TARGET != 'retrivePassword'
       and  SYS_COLLECTION != 'services' and SYS_COLLECTION != 'tracker' and $collectionPlugin != 'services'
       and  $bWE != true and SYS_TARGET != 'defaultAjaxDynaform' and SYS_TARGET != 'dynaforms_checkDependentFields' and SYS_TARGET != 'cases_ShowDocument') {
         $bRedirect = true;