diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php
index e234c041e..04f2a2448 100755
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -339,7 +339,14 @@ $flagForgotPassword = isset($oConf->aConfig['login_enableForgotPassword'])
                       : 'off';
 
 setcookie('PM-Warning', trim(G::LoadTranslation('ID_BLOCKER_MSG'), '*'), time() + (24 * 60 * 60), SYS_URI);
-setcookie("PM-TabPrimary", uniqid(), time() + (24 * 60 * 60), '/');
+
+$configS = System::getSystemConfiguration('', '', SYS_SYS);
+$activeSession = isset($configS['session_block']) ? !(int)$configS['session_block'] : true;
+if ($activeSession) {
+    setcookie("PM-TabPrimary", 101010010, time() + (24 * 60 * 60), '/');
+} else {
+    setcookie("PM-TabPrimary", uniqid(), time() + (24 * 60 * 60), '/');
+}
 
 $oHeadPublisher->addScriptCode("var flagForgotPassword = '$flagForgotPassword';");
 $oHeadPublisher->addScriptFile('/jscore/src/PM.js');
diff --git a/workflow/engine/xmlform/login/login.xml b/workflow/engine/xmlform/login/login.xml
index 2c4d65517..9109b06f5 100755
--- a/workflow/engine/xmlform/login/login.xml
+++ b/workflow/engine/xmlform/login/login.xml
@@ -25,6 +25,23 @@ SELECT LANG_ID, LANG_NAME FROM langOptions
     <en><![CDATA[Forgot Password]]></en>
   </FORGOT_PASWORD_LINK>
   <JS type="javascript"><![CDATA[
+
+//validate iframe login
+if(inIframe()) {
+  if (PM.Sessions.getCookie('PM-TabPrimary') !== '101010010'
+      && (window.location.pathname.indexOf("login/login") !== -1
+      || window.location.pathname.indexOf("sysLogin") !== -1)) {
+      window.top.location.href = window.location.pathname;
+  }
+}
+function inIframe () {
+    try {
+        return window.self !== window.top;
+    } catch (e) {
+        return true;
+    }
+};
+
 // enable/disable forgot password link
 if(flagForgotPassword == 'on' || flagForgotPassword == '1') {
   document.getElementById("form[FORGOT_PASWORD_LINK]").style.display = 'block';//hideRowById('FORGOT_PASWORD_LINK');
diff --git a/workflow/engine/xmlform/login/loginpm3.xml b/workflow/engine/xmlform/login/loginpm3.xml
index 135da30a4..758625947 100755
--- a/workflow/engine/xmlform/login/loginpm3.xml
+++ b/workflow/engine/xmlform/login/loginpm3.xml
@@ -28,6 +28,21 @@ SELECT LANG_ID, LANG_NAME FROM langOptions
   </FORGOT_PASWORD_LINK>
   <JS type="javascript"><![CDATA[
 
+//validate iframe login
+if(inIframe()) {
+  if (PM.Sessions.getCookie('PM-TabPrimary') !== '101010010'
+      && (window.location.pathname.indexOf("login/login") !== -1
+      || window.location.pathname.indexOf("sysLogin") !== -1)) {
+      window.top.location.href = window.location.pathname;
+  }
+}
+function inIframe () {
+    try {
+        return window.self !== window.top;
+    } catch (e) {
+        return true;
+    }
+};
 function getElementsByClassNameIE8(node, classname) {
     var a = [];
     var re = new RegExp('(^| )'+classname+'( |$)');