diff --git a/workflow/engine/src/BusinessModel/User.php b/workflow/engine/src/BusinessModel/User.php
index db6bbd64b..eaeb38f2e 100644
--- a/workflow/engine/src/BusinessModel/User.php
+++ b/workflow/engine/src/BusinessModel/User.php
@@ -661,17 +661,17 @@ class User
                 if ($start < 0) {
                     throw (new \Exception( 'invalid value specified for `start`.'));
                 } else {
-                    $oCriteria->setOffset( $start );
+                    $oCriteria->setOffset($start);
                 }
             }
-            if (isset($limit)) {
+            if ($limit != '') {
                 if ($limit < 0) {
                     throw (new \Exception( 'invalid value specified for `limit`.'));
                 } else {
                     if ($limit == 0) {
-                        return $aUsers;
+                        return $aUserInfo;
                     } else {
-                        $oCriteria->setLimit( $limit );
+                        $oCriteria->setLimit($limit);
                     }
                 }
             }
diff --git a/workflow/engine/src/Services/Api/ProcessMaker/User.php b/workflow/engine/src/Services/Api/ProcessMaker/User.php
index 9b4cc49f6..272dfec44 100644
--- a/workflow/engine/src/Services/Api/ProcessMaker/User.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/User.php
@@ -18,7 +18,7 @@ class User extends Api
     {
         try {
             $user = new \BusinessModel\User();
-            $response = $user->getUsers($filter, null, null, $start, $limit);
+            $response = $user->getUsers($filter, $start, $limit);
             return $response;
         } catch (\Exception $e) {
             throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));