diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 6ed0307ec..bda850df9 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -284,7 +284,7 @@ $(document).ready(function() {
 					foreach ($res as $r) {
 						if($r['reviewerUserID'] > 0) {
 							$u = $dms->getUser($r['reviewerUserID']);
-							$tmp[] =  $u->getFullName().' ('.$u->getLogin().')';
+							$tmp[] =  htmlspecialchars($u->getFullName().' ('.$u->getLogin().')');
 						}
 					}
 					if($tmp) {
@@ -335,7 +335,7 @@ $(document).ready(function() {
 					foreach ($res as $r) {
 						if($r['reviewerGroupID'] > 0) {
 							$u = $dms->getGroup($r['reviewerGroupID']);
-							$tmp[] =  $u->getName();
+							$tmp[] =  htmlspecialchars($u->getName());
 						}
 					}
 					if($tmp) {
@@ -394,7 +394,7 @@ $(document).ready(function() {
 					foreach ($res as $r) {
 						if($r['approverUserID'] > 0) {
 							$u = $dms->getUser($r['approverUserID']);
-							$tmp[] =  $u->getFullName().' ('.$u->getLogin().')';
+							$tmp[] =  htmlspecialchars($u->getFullName().' ('.$u->getLogin().')');
 						}
 					}
 					if($tmp) {
@@ -446,7 +446,7 @@ $(document).ready(function() {
 					foreach ($res as $r) {
 						if($r['approverGroupID'] > 0) {
 							$u = $dms->getGroup($r['approverGroupID']);
-							$tmp[] =  $u->getName();
+							$tmp[] =  htmlspecialchars($u->getName());
 						}
 					}
 					if($tmp) {
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 98e415362..ac9d7488e 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -203,6 +203,21 @@ function checkForm()
 ?>
         </select>
 <?php
+				/* List all mandatory reviewers */
+				if($res) {
+					$tmp = array();
+					foreach ($res as $r) {
+						if($r['reviewerUserID'] > 0) {
+							$u = $dms->getUser($r['reviewerUserID']);
+							$tmp[] =  htmlspecialchars($u->getFullName().' ('.$u->getLogin().')');
+						}
+					}
+					if($tmp) {
+						echo '<div class="mandatories"><span>'.getMLText('mandatory_reviewers').':</span> ';
+						echo implode(', ', $tmp);
+						echo "</div>\n";
+					}
+				}
 				/* Check for mandatory reviewer without access */
 				foreach($res as $r) {
 					if($r['reviewerUserID']) {
@@ -238,6 +253,22 @@ function checkForm()
 ?>
 			</select>
 <?php
+				/* List all mandatory groups of reviewers */
+				if($res) {
+					$tmp = array();
+					foreach ($res as $r) {
+						if($r['reviewerGroupID'] > 0) {
+							$u = $dms->getGroup($r['reviewerGroupID']);
+							$tmp[] =  htmlspecialchars($u->getName());
+						}
+					}
+					if($tmp) {
+						echo '<div class="mandatories"><span>'.getMLText('mandatory_reviewergroups').':</span> ';
+						echo implode(', ', $tmp);
+						echo "</div>\n";
+					}
+				}
+
 				/* Check for mandatory reviewer group without access */
 				foreach($res as $r) {
 					if ($r['reviewerGroupID']) {
@@ -280,6 +311,22 @@ function checkForm()
 ?>
         </select>
 <?php
+				/* List all mandatory approvers */
+				if($res) {
+					$tmp = array();
+					foreach ($res as $r) {
+						if($r['approverUserID'] > 0) {
+							$u = $dms->getUser($r['approverUserID']);
+							$tmp[] =  htmlspecialchars($u->getFullName().' ('.$u->getLogin().')');
+						}
+					}
+					if($tmp) {
+						echo '<div class="mandatories"><span>'.getMLText('mandatory_approvers').':</span> ';
+						echo implode(', ', $tmp);
+						echo "</div>\n";
+					}
+				}
+
 				/* Check for mandatory approvers without access */
 				foreach($res as $r) {
 					if($r['approverUserID']) {
@@ -315,6 +362,22 @@ function checkForm()
 ?>
         </select>
 <?php
+				/* List all mandatory groups of approvers */
+				if($res) {
+					$tmp = array();
+					foreach ($res as $r) {
+						if($r['approverGroupID'] > 0) {
+							$u = $dms->getGroup($r['approverGroupID']);
+							$tmp[] =  htmlspecialchars($u->getName());
+						}
+					}
+					if($tmp) {
+						echo '<div class="mandatories"><span>'.getMLText('mandatory_approvergroups').':</span> ';
+						echo implode(', ', $tmp);
+						echo "</div>\n";
+					}
+				}
+
 				/* Check for mandatory approver groups without access */
 				foreach($res as $r) {
 					if ($r['approverGroupID']) {