diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index 477a26c30..7fbbfde0e 100644
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -308,15 +308,16 @@ class BpmnWorkflow extends Project\Bpmn
 
         $eventUid = parent::addEvent($data);
         $event = \BpmnEventPeer::retrieveByPK($eventUid);
+        $prj_uid = $event->getPrjUid();
 
         // create case scheduler
         if ($event->getEvnMarker() == "TIMER") {
-            $this->wp->addCaseScheduler();
+            $this->wp->addCaseScheduler($eventUid, $prj_uid);
         }
 
         // create web entry
         if ($event->getEvnMarker() == "MESSAGE") {
-            $this->wp->addWebEntry();
+            $this->wp->addWebEntry($eventUid, $prj_uid);
         }
 
         //return parent::addEvent($data);
diff --git a/workflow/engine/src/ProcessMaker/Project/Workflow.php b/workflow/engine/src/ProcessMaker/Project/Workflow.php
index 8739bd8d0..3c903487f 100644
--- a/workflow/engine/src/ProcessMaker/Project/Workflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Workflow.php
@@ -775,7 +775,7 @@ class Workflow extends Handler
         $this->update(array("PRO_STATUS" => $status));
     }
 
-    public function addCaseScheduler()
+    public function addCaseScheduler($eventUid, $prj_uid)
     {
         try {
             $caseScheduler = new \CaseScheduler();
@@ -783,7 +783,7 @@ class Workflow extends Handler
                 'SCH_NAME'=>'',
                 'SCH_DEL_USER_NAME'=>'',
                 'SCH_DEL_USER_UID'=>'',
-                'PRO_UID'=>'',
+                'PRO_UID'=>$prj_uid,
                 'TAS_UID'=>'',
                 'SCH_TIME_NEXT_RUN'=>date('Y-m-d H:i:s'),
                 'SCH_LAST_RUN_TIME'=>NULL,
@@ -805,7 +805,7 @@ class Workflow extends Handler
                 'SCH_REPEAT_STOP_IF_RUNNING'=>'',
                 'CASE_SH_PLUGIN_UID'=>NULL,
                 'SCH_DEL_USER_PASS'=>'',
-                'SCH_UID'=>Common::generateUID(),
+                'SCH_UID'=>$eventUid,
                 'SCH_REPEAT_UNTIL'=>''
             );
 
@@ -837,12 +837,13 @@ class Workflow extends Handler
 
     }
 
-    public function addWebEntry()
+    public function addWebEntry($eventUid, $prj_uid)
     {
         try {
             $webEntry = new \WebEntry();
-            $webEntryUid = Common::generateUID();
+            $webEntryUid = $eventUid;
             $webEntry->setWeUid($webEntryUid);
+            $webEntry->setProUid($prj_uid);
             $webEntry->setWeMethod('');
             $webEntry->setWeCreateDate(date('Y-m-d H:i:s'));
             $webEntry->save();