diff --git a/Rakefile b/Rakefile
index 5b65a0f6e..82c3a4699 100644
--- a/Rakefile
+++ b/Rakefile
@@ -386,6 +386,7 @@ def getJsIncludeFiles
         "gulliver/js/codemirror/addon/hint/show-hint.js",
         "gulliver/js/codemirror/addon/hint/javascript-hint.js",
         "gulliver/js/codemirror/addon/hint/sql-hint.js",
+        "gulliver/js/codemirror/addon/hint/php-hint.js",
         "gulliver/js/codemirror/mode/javascript/javascript.js",
         "gulliver/js/codemirror/addon/edit/matchbrackets.js",
         "gulliver/js/codemirror/mode/htmlmixed/htmlmixed.js",
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
index d6b6c31f2..d2ac8fba8 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
@@ -321,7 +321,7 @@ class Task
             }
 
             //Validating TAS_TRANSFER_FLY value
-            if ($arrayProperty["TAS_TRANSFER_FLY"] == "TRUE") {
+            if ($arrayProperty["TAS_TRANSFER_FLY"] == "FALSE") {
                 if (!isset($arrayProperty["TAS_DURATION"])) {
                     throw (new \Exception("Invalid value specified for 'tas_duration'"));
                 }
diff --git a/workflow/engine/xmlform/login/login.xml b/workflow/engine/xmlform/login/login.xml
index 54fb684f2..2c4d65517 100755
--- a/workflow/engine/xmlform/login/login.xml
+++ b/workflow/engine/xmlform/login/login.xml
@@ -86,6 +86,20 @@ var dynaformOnload = function() {
   }
 };
 
+leimnud.event.add(document.getElementById('form[USR_PASSWORD_MASK]'), 'keypress', function(event) {
+  var key;
+  if(window.event)
+    key = window.event.keyCode;     //IE
+  else
+    key = event.which;     //firefox
+  if(key == 13) {
+    document.getElementById('form[BSUBMIT]').click();
+    return true;
+  } else {
+    return true;
+  }
+});
+
 leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() {
   document.getElementById('form[USR_PASSWORD]').value = document.getElementById('form[USR_PASSWORD_MASK]').value;
   document.getElementById('form[USR_PASSWORD_MASK]').value = '';
diff --git a/workflow/engine/xmlform/login/loginpm3.xml b/workflow/engine/xmlform/login/loginpm3.xml
index 99ff2d1d8..f1811cbcb 100755
--- a/workflow/engine/xmlform/login/loginpm3.xml
+++ b/workflow/engine/xmlform/login/loginpm3.xml
@@ -25,7 +25,6 @@ SELECT LANG_ID, LANG_NAME FROM langOptions
     <en><![CDATA[Forgot Password]]></en>
   </FORGOT_PASWORD_LINK>
   <JS type="javascript"><![CDATA[
-
 window.onload= function(){   
   document.getElementById('form[USR_USERNAME]').placeholder = _('ID_USER');
   document.getElementById('form[USR_PASSWORD_MASK]').placeholder = _('ID_PASSWORD');
@@ -94,6 +93,20 @@ var dynaformOnload = function() {
   }
 };
 
+leimnud.event.add(document.getElementById('form[USR_PASSWORD_MASK]'), 'keypress', function(event) {
+  var key;
+  if(window.event)
+    key = window.event.keyCode;     //IE
+  else
+    key = event.which;     //firefox
+  if(key == 13) {
+    document.getElementById('form[BSUBMIT]').click();
+    return true;
+  } else {
+    return true;
+  }
+});
+
 leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() {
   setNestedProperty(this, Array('disabled'), 'true');
   setNestedProperty(this, Array('value'), @@LOGIN_VERIFY_MSG);
diff --git a/workflow/engine/xmlform/login/sysLoginNoWS.xml b/workflow/engine/xmlform/login/sysLoginNoWS.xml
index 8e854da06..54ec779db 100755
--- a/workflow/engine/xmlform/login/sysLoginNoWS.xml
+++ b/workflow/engine/xmlform/login/sysLoginNoWS.xml
@@ -27,6 +27,20 @@ SELECT LANG_ID, LANG_NAME FROM langOptions
 
 setFocus (getField ('USR_USERNAME'));
 
+leimnud.event.add(document.getElementById('form[USR_PASSWORD_MASK]'), 'keypress', function(event) {
+  var key;
+  if(window.event)
+    key = window.event.keyCode;     //IE
+  else
+    key = event.which;     //firefox
+  if(key == 13) {
+    document.getElementById('form[BSUBMIT]').click();
+    return true;
+  } else {
+    return true;
+  }
+});
+
 leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() {
     ws = getField('USER_ENV').value;
     createCookie('pmos_generik2', '{"ws":"'+ws+'"}', 365);
diff --git a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml
index 30d75bcff..a0c0202a3 100755
--- a/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml
+++ b/workflow/engine/xmlform/login/sysLoginNoWSpm3.xml
@@ -34,6 +34,20 @@ window.onload= function(){
 
 setFocus (getField ('USR_USERNAME'));
 
+leimnud.event.add(document.getElementById('form[USR_PASSWORD_MASK]'), 'keypress', function(event) {
+  var key;
+  if(window.event)
+    key = window.event.keyCode;     //IE
+  else
+    key = event.which;     //firefox
+  if(key == 13) {
+    document.getElementById('form[BSUBMIT]').click();
+    return true;
+  } else {
+    return true;
+  }
+});
+
 leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() {
     ws = getField('USER_ENV').value;
     createCookie('pmos_generik2', '{"ws":"'+ws+'"}', 365);
diff --git a/workflow/engine/xmlform/tasks/tasks_TimingControl.xml b/workflow/engine/xmlform/tasks/tasks_TimingControl.xml
index 5f462988e..e76b99ca2 100755
--- a/workflow/engine/xmlform/tasks/tasks_TimingControl.xml
+++ b/workflow/engine/xmlform/tasks/tasks_TimingControl.xml
@@ -4,7 +4,7 @@
   <INDEX type="hidden"/>
   <IFORM type="hidden"/>
   <TAS_TRANSFER_FLY type="checkbox" value="TRUE" falsevalue="FALSE" defaultvalue="TRUE" group="1">
-    <en><![CDATA[Allow user defined timing control]]></en>
+    <en><![CDATA[Allow users to change the task duration in runtime]]></en>
   </TAS_TRANSFER_FLY>
   <TAS_DURATION type="text" size="3" maxlength="3" defaultvalue="1" required="1" validate="Any" mask="###" group="1" dependentfields="" linkfield="" strto="UPPER" readonly="0" noshowingrid="0" readonlyingrid="0" totalizeable="0" sqlconnection="">
     <en><![CDATA[Task duration]]></en>
@@ -23,7 +23,7 @@ SELECT CALENDAR_UID, CALENDAR_NAME FROM availableCalendars
 
 var toggleFields = function()
 {
-    if(getField('TAS_TRANSFER_FLY').checked == true)
+    if(getField('TAS_TRANSFER_FLY').checked == false)
     {
       showRowById('TAS_DURATION');
       showRowById('TAS_TIMEUNIT');