diff --git a/workflow/engine/classes/class.calendar.php b/workflow/engine/classes/class.calendar.php
index 7ec30c177..48f50b77f 100755
--- a/workflow/engine/classes/class.calendar.php
+++ b/workflow/engine/classes/class.calendar.php
@@ -414,7 +414,7 @@ class calendar extends CalendarDefinition
     			$hoursDuration -= (float)($secondRes/3600);
     			//$dataLog[] = (float)($secondRes/3600);
     		} else {
-    			$newDate = date('Y-m-d H:i:s', strtotime('+' . (((float)$hoursDuration)*3600) . ' seconds', strtotime($newDate)));
+    			$newDate = date("Y-m-d H:i:s", strtotime("+" . round(((float)($hoursDuration)) * 3600) . " seconds", strtotime($newDate)));
     			//$dataLog[] = (float)($hoursDuration);
     			$hoursDuration = 0;
     		}
diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index 902e075e8..0235e922c 100755
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -1384,10 +1384,6 @@ class BpmnWorkflow extends Project\Bpmn
 
             $activity = $bwp->getActivity($activityData["ACT_UID"]);
 
-            if ($activity["BOU_CONTAINER"] != $activityData["BOU_CONTAINER"]) {
-                $activity = null;
-            }
-
             if ($forceInsert || is_null($activity)) {
                 if ($generateUid) {
                     //Generate and update UID
diff --git a/workflow/engine/templates/setup/newSite.js b/workflow/engine/templates/setup/newSite.js
index 17682f224..badfc12e5 100755
--- a/workflow/engine/templates/setup/newSite.js
+++ b/workflow/engine/templates/setup/newSite.js
@@ -198,20 +198,23 @@ Ext.onReady(function(){
   function createNW(nwTitle, aoDbWf, aoDbRb, aoDbRp, nwUsername, nwPassword, nwPassword2){
     PMExt.confirm(_('ID_CONFIRM'), _('NEW_SITE_CONFIRM_TO_CREATE'), function(){
     var loadMask = new Ext.LoadMask(document.body, {msg : _('ID_SITE_CREATING')});
+    var oParams = {
+        action : 'create',
+        NW_TITLE : nwTitle,
+        AO_DB_WF : aoDbWf,
+        AO_DB_RB : aoDbRb,
+        AO_DB_RP : aoDbRp,
+        NW_USERNAME : nwUsername,
+        NW_PASSWORD : nwPassword,
+        NW_PASSWORD2 : nwPassword2
+    };
+    if(aoDbDrop){
+        oParams.AO_DB_DROP = 'On';
+    }    
     loadMask.show();
      Ext.Ajax.request({
       url: '../newSiteProxy/testingNW',
-      params: {
-      action : 'create',
-      NW_TITLE : nwTitle,
-      AO_DB_WF : aoDbWf,
-      AO_DB_RB : aoDbRb,
-      AO_DB_RP : aoDbRp,
-      NW_USERNAME : nwUsername,
-      NW_PASSWORD : nwPassword,
-      NW_PASSWORD2 : nwPassword2,
-      AO_DB_DROP : aoDbDrop
-      },
+      params: oParams,
       method: 'POST',
       success: function ( result, request ) {
       loadMask.hide();
diff --git a/workflow/engine/xmlform/login/forgotPasswordpm3.xml b/workflow/engine/xmlform/login/forgotPasswordpm3.xml
index 1c148713a..204c4d134 100755
--- a/workflow/engine/xmlform/login/forgotPasswordpm3.xml
+++ b/workflow/engine/xmlform/login/forgotPasswordpm3.xml
@@ -6,7 +6,7 @@
   <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"  autocomplete="0">
+  <USR_EMAIL type="text" size="30" required="true" maxlength="64"  autocomplete="0">
     <en><![CDATA[Email]]></en>
   </USR_EMAIL>
   <URL type="hidden"/>