diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 4b242fca3..f6cff0cdb 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -722,45 +722,14 @@ switch($command) {
 
 				if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') {
 					// add mandatory reviewers/approvers
-					$docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp);
 					if($settings->_workflowMode == 'traditional') {
-						$res=$user->getMandatoryReviewers();
-						foreach ($res as $r){
-
-							if ($r['reviewerUserID']!=0){
-								foreach ($docAccess["users"] as $usr)
-									if ($usr->getID()==$r['reviewerUserID']){
-										$reviewers["i"][] = $r['reviewerUserID'];
-										break;
-									}
-							}
-							else if ($r['reviewerGroupID']!=0){
-								foreach ($docAccess["groups"] as $grp)
-									if ($grp->getID()==$r['reviewerGroupID']){
-										$reviewers["g"][] = $r['reviewerGroupID'];
-										break;
-									}
-							}
-						}
-					}
-					$res=$user->getMandatoryApprovers();
-					foreach ($res as $r){
-
-						if ($r['approverUserID']!=0){
-							foreach ($docAccess["users"] as $usr)
-								if ($usr->getID()==$r['approverUserID']){
-									$approvers["i"][] = $r['approverUserID'];
-									break;
-								}
-						}
-						else if ($r['approverGroupID']!=0){
-							foreach ($docAccess["groups"] as $grp)
-								if ($grp->getID()==$r['approverGroupID']){
-									$approvers["g"][] = $r['approverGroupID'];
-									break;
-								}
-						}
+						$mreviewers = getMandatoryReviewers($folder, $user);
+						if($mreviewers['i'])
+							$reviewers['i'] = array_merge($reviewers['i'], $mreviewers['i']);
 					}
+					$mapprovers = getMandatoryApprovers($folder, $user);
+					if($mapprovers['i'])
+						$approvers['i'] = array_merge($approvers['i'], $mapprovers['i']);
 
 				} elseif($settings->_workflowMode == 'advanced') {
 					$workflow = $user->getMandatoryWorkflow();