diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
index 462f919c3..a3d43e99a 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -1126,12 +1126,15 @@ class Cases
             $aAux = $oAppDocument->load($aRow['APP_DOC_UID'], $aRow['DOC_VERSION']);
             $lastVersion = $oAppDocument->getLastAppDocVersion($aRow['APP_DOC_UID'], $sApplicationUID);
 
-            try {
-                $aAux1 = $oUser->load($aAux['USR_UID']);
+            if ($aAux['USR_UID'] !== "-1") {
+                try {
+                    $aAux1 = $oUser->load($aAux['USR_UID']);
 
-                $sUser = $conf->usersNameFormatBySetParameters($confEnvSetting["format"], $aAux1["USR_USERNAME"], $aAux1["USR_FIRSTNAME"], $aAux1["USR_LASTNAME"]);
-            } catch (Exception $oException) {
-                //$sUser = '(USER DELETED)';
+                    $sUser = $conf->usersNameFormatBySetParameters($confEnvSetting["format"], $aAux1["USR_USERNAME"], $aAux1["USR_FIRSTNAME"], $aAux1["USR_LASTNAME"]);
+                } catch (Exception $oException) {
+                    $sUser = '***';
+                }
+            } else {
                 $sUser = '***';
             }
             $aFields = array(
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/InputDocument.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/InputDocument.php
index fa1144c7f..73294da68 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/InputDocument.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/InputDocument.php
@@ -406,13 +406,16 @@ class InputDocument
             while ($rsCriteria->next()) {
                 $row = $rsCriteria->getRow();
 
-                $arrayUserData = $user->load($row["USR_UID"]);
-
+                $sUser = '***';
+                if ($row["USR_UID"] !== '-1') {
+                    $arrayUserData = $user->load($row["USR_UID"]);
+                    $sUser = $configuraction->usersNameFormatBySetParameters($confEnvSetting["format"], $arrayUserData["USR_USERNAME"], $arrayUserData["USR_FIRSTNAME"], $arrayUserData["USR_LASTNAME"]);
+                }
                 $arrayAppDocument = $appDocument->load($row["APP_DOC_UID"], $row["DOC_VERSION"]);
 
 
                 $row["APP_DOC_FILENAME"] = $arrayAppDocument["APP_DOC_FILENAME"];
-                $row["APP_DOC_CREATE_USER"] = $configuraction->usersNameFormatBySetParameters($confEnvSetting["format"], $arrayUserData["USR_USERNAME"], $arrayUserData["USR_FIRSTNAME"], $arrayUserData["USR_LASTNAME"]);
+                $row["APP_DOC_CREATE_USER"] = $sUser;
                 $row["APP_DOC_LINK"] = "cases/cases_ShowDocument?a=" . $row["APP_DOC_UID"] . "&v=" . $row["DOC_VERSION"];
                 /*----------------------------------********---------------------------------*/
                 //change donwload link - drive