diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index f7a5f7398..cce07f3ac 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -272,6 +272,22 @@ function addFiles()
 				}
 ?>
         </select>
+<?php
+				/* Check for mandatory reviewer without access */
+				foreach($res as $r) {
+					if($r['reviewerUserID']) {
+						$hasAccess = false;
+						foreach ($docAccess["users"] as $usr) {
+							if ($r['reviewerUserID']==$usr->getID())
+								$hasAccess = true;
+						}
+						if(!$hasAccess) {
+							$noAccessUser = $dms->getUser($r['reviewerUserID']);
+							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_reviewer_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")")))."</div>";
+						}
+					}
+				}
+?>
       </td>
       </tr>
       <tr>
@@ -291,6 +307,22 @@ function addFiles()
 			}
 ?>
 			</select>
+<?php
+				/* Check for mandatory reviewer group without access */
+				foreach($res as $r) {
+					if ($r['reviewerGroupID']) {
+						$hasAccess = false;
+						foreach ($docAccess["groups"] as $grp) {
+							if ($r['reviewerGroupID']==$grp->getID())
+								$hasAccess = true;
+						}
+						if(!$hasAccess) {
+							$noAccessGroup = $dms->getGroup($r['reviewerGroupID']);
+							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_reviewergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName())))."</div>";
+						}
+					}
+				}
+?>
 			</td>
 			</tr>
 			
@@ -319,6 +351,22 @@ function addFiles()
 			}
 ?>
 			</select>
+<?php
+				/* Check for mandatory approvers without access */
+				foreach($res as $r) {
+					if($r['approverUserID']) {
+						$hasAccess = false;
+						foreach ($docAccess["users"] as $usr) {
+							if ($r['approverUserID']==$usr->getID())
+								$hasAccess = true;
+						}
+						if(!$hasAccess) {
+							$noAccessUser = $dms->getUser($r['approverUserID']);
+							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_approver_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")")))."</div>";
+						}
+					}
+				}
+?>
 				</td>
 		  </tr>	
 		  <tr>	
@@ -339,6 +387,22 @@ function addFiles()
 			}
 ?>
 			</select>
+<?php
+				/* Check for mandatory approver groups without access */
+				foreach($res as $r) {
+					if ($r['approverGroupID']) {
+						$hasAccess = false;
+						foreach ($docAccess["groups"] as $grp) {
+							if ($r['approverGroupID']==$grp->getID())
+								$hasAccess = true;
+						}
+						if(!$hasAccess) {
+							$noAccessGroup = $dms->getGroup($r['approverGroupID']);
+							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_approvergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName())))."</div>";
+						}
+					}
+				}
+?>
 				</td>
 		  </tr>	
 		  <tr>	
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index d631e39e6..b98e757d2 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -193,7 +193,7 @@ if(!is_writeable($settings->_configFilePath)) {
         <td>
           <SELECT name="sortFoldersDefault">
             <OPTION VALUE="u" <?php if ($settings->_sortFoldersDefault=='') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_unsorted");?></OPTION>
-            <OPTION VALUE="n" <?php if ($settings->_sortFoldersDefault=='s') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_sequence");?></OPTION>
+            <OPTION VALUE="s" <?php if ($settings->_sortFoldersDefault=='s') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_sequence");?></OPTION>
             <OPTION VALUE="n" <?php if ($settings->_sortFoldersDefault=='n') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_name");?></OPTION>
           </SELECT>
       </tr>
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 2d91a5645..694cdd975 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -198,6 +198,22 @@ function checkForm()
 				}
 ?>
         </select>
+<?php
+				/* Check for mandatory reviewer without access */
+				foreach($res as $r) {
+					if($r['reviewerUserID']) {
+						$hasAccess = false;
+						foreach ($docAccess["users"] as $usr) {
+							if ($r['reviewerUserID']==$usr->getID())
+								$hasAccess = true;
+						}
+						if(!$hasAccess) {
+							$noAccessUser = $dms->getUser($r['reviewerUserID']);
+							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_reviewer_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")")))."</div>";
+						}
+					}
+				}
+?>
       </td>
     </tr>
     <tr>
@@ -215,6 +231,23 @@ function checkForm()
 					if ($mandatory) print "<option value=\"".$grp->getID()."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
 					else print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
 				}
+?>
+			</select>
+<?php
+				/* Check for mandatory reviewer group without access */
+				foreach($res as $r) {
+					if ($r['reviewerGroupID']) {
+						$hasAccess = false;
+						foreach ($docAccess["groups"] as $grp) {
+							if ($r['reviewerGroupID']==$grp->getID())
+								$hasAccess = true;
+						}
+						if(!$hasAccess) {
+							$noAccessGroup = $dms->getGroup($r['reviewerGroupID']);
+							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_reviewergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName())))."</div>";
+						}
+					}
+				}
 ?>
       </td>
     </tr>
@@ -242,6 +275,22 @@ function checkForm()
 				}
 ?>
         </select>
+<?php
+				/* Check for mandatory approvers without access */
+				foreach($res as $r) {
+					if($r['approverUserID']) {
+						$hasAccess = false;
+						foreach ($docAccess["users"] as $usr) {
+							if ($r['approverUserID']==$usr->getID())
+								$hasAccess = true;
+						}
+						if(!$hasAccess) {
+							$noAccessUser = $dms->getUser($r['approverUserID']);
+							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_approver_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")")))."</div>";
+						}
+					}
+				}
+?>
       </td>
     </tr>
       <td>
@@ -261,6 +310,22 @@ function checkForm()
 				}
 ?>
         </select>
+<?php
+				/* Check for mandatory approver groups without access */
+				foreach($res as $r) {
+					if ($r['approverGroupID']) {
+						$hasAccess = false;
+						foreach ($docAccess["groups"] as $grp) {
+							if ($r['approverGroupID']==$grp->getID())
+								$hasAccess = true;
+						}
+						if(!$hasAccess) {
+							$noAccessGroup = $dms->getGroup($r['approverGroupID']);
+							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_approvergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName())))."</div>";
+						}
+					}
+				}
+?>
 			</td>
 			</tr>
 		<tr>