diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ProjectUser.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProjectUser.php
index 72b3575d9..0d5839f3b 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ProjectUser.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProjectUser.php
@@ -122,7 +122,7 @@ class ProjectUser
             $oCriteria = new \Criteria('workflow');
             $oCriteria->addSelectColumn(\GroupUserPeer::USR_UID);
             $oCriteria->addJoin(\TaskPeer::TAS_UID, \TaskUserPeer::TAS_UID,  \Criteria::LEFT_JOIN);
-            $oCriteria->addJoin(\TaskUserPeer::TAS_UID, \GroupUserPeer::GRP_UID, \Criteria::LEFT_JOIN);
+            $oCriteria->addJoin(\TaskUserPeer::USR_UID, \GroupUserPeer::GRP_UID, \Criteria::LEFT_JOIN);
             $oCriteria->add(\TaskPeer::PRO_UID, $sProcessUID);
             $oCriteria->add(\TaskUserPeer::TU_TYPE, 1);
             $oCriteria->add(\TaskUserPeer::TU_RELATION, 2);
diff --git a/workflow/public_html/app.php b/workflow/public_html/app.php
index c53e41c13..50d6cc21f 100644
--- a/workflow/public_html/app.php
+++ b/workflow/public_html/app.php
@@ -2,6 +2,9 @@
 /*
  * ProcessMaker Web Application Bootstrap
  */
+if (isset($_SERVER['UNENCODED_URL'])) {
+    $_SERVER['REQUEST_URI'] = $_SERVER['UNENCODED_URL'];
+}
 try {
     $rootDir = realpath(__DIR__ . "/../../") . DIRECTORY_SEPARATOR;