diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index 0e0d1880b..35d3267b0 100644
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -668,6 +668,7 @@ class BpmnWorkflow extends Project\Bpmn
         $diagram = isset($projectData["diagrams"]) && isset($projectData["diagrams"][0]) ? $projectData["diagrams"][0] : array();
         $result = array();
 
+        $projectData['prj_uid'] = $prjUid;
         $bwp = BpmnWorkflow::load($prjUid);
         $projectRecord = array_change_key_case($projectData, CASE_UPPER);
         $bwp->update($projectRecord);
@@ -799,7 +800,6 @@ class BpmnWorkflow extends Project\Bpmn
                 $bwp->removeGateway($gatewayData["GAT_UID"]);
             }
         }
-
         /*
          * Diagram's Events Handling
          */
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project.php b/workflow/engine/src/ProcessMaker/Services/Api/Project.php
index 0cc1147e2..7efa49eb7 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Project.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Project.php
@@ -63,6 +63,9 @@ class Project extends Api
     public function post($prj_name, $request_data)
     {
         try {
+            if (!isset($request_data['prj_author'])) {
+                $request_data['prj_author'] = $this->getUserId();
+            }
             return Adapter\BpmnWorkflow::createFromStruct($request_data);
         } catch (\Exception $e) {
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());