diff --git a/lam/templates/initsuff.php b/lam/templates/initsuff.php
index d4777baf..b7919a8f 100644
--- a/lam/templates/initsuff.php
+++ b/lam/templates/initsuff.php
@@ -148,23 +148,17 @@ if ($_POST['add_suff'] || $_POST['cancel']) {
 			for ($i = 0; $i < sizeof($fail); $i++) {
 				StatusMessage("ERROR", _("Failed to create entry!") . "<br>" . $error[$i], $fail[$i]);
 			}
-			echo "<p>&nbsp;</p>\n";
-			echo "<a href=\"lists/listusers.php\">" . _("User list") . "</a>\n";
 			echo "</body></html>\n";
 		}
 		else {
 			// print success message
 			StatusMessage("INFO", "", _("All changes were successful."));
-			echo "<p>&nbsp;</p>\n";
-			echo "<a href=\"lists/listusers.php\">" . _("User list") . "</a>\n";
 			echo "</body></html>\n";
 		}
 	}
 	else {
 		// no suffixes were created
 		StatusMessage("INFO", "", _("No changes were made."));
-		echo "<p>&nbsp;</p>\n";
-		echo "<a href=\"lists/listusers.php\">" . _("User list") . "</a>\n";
 		echo "</body></html>\n";
 	}
 	exit;
diff --git a/lam/templates/main_header.php b/lam/templates/main_header.php
index a6d60d9d..a857257a 100644
--- a/lam/templates/main_header.php
+++ b/lam/templates/main_header.php
@@ -40,7 +40,9 @@ setlanguage();
 echo $_SESSION['header'];
 
 // number of list views (users, groups, ...)
-$lists = 2;
+$lists = 0;
+if ($_SESSION['config']->get_Usersuffix() != "") $lists++;
+if ($_SESSION['config']->get_Groupsuffix() != "") $lists++;
 if ($_SESSION['config']->get_Hostsuffix() != "") $lists++;
 
 ?>
@@ -71,8 +73,12 @@ if ($_SESSION['config']->get_Hostsuffix() != "") $lists++;
 	<tr>
 		<td></td>
 		<?php
-			echo '<td width="120" align="center"><a href="./lists/listusers.php" target="mainpart"><big>' . _("Users") . '</big></a></td>' . "\n";
-			echo '<td width="120" align="center"><a href="./lists/listgroups.php" target="mainpart"><big>' . _("Groups") . '</big></a></td>' . "\n";
+			if ($_SESSION['config']->get_Usersuffix() != "") {
+				echo '<td width="120" align="center"><a href="./lists/listusers.php" target="mainpart"><big>' . _("Users") . '</big></a></td>' . "\n";
+			}
+			if ($_SESSION['config']->get_Groupsuffix() != "") {
+				echo '<td width="120" align="center"><a href="./lists/listgroups.php" target="mainpart"><big>' . _("Groups") . '</big></a></td>' . "\n";
+			}
 			if ($_SESSION['config']->get_Hostsuffix() != "") {
 				echo '<td width="120" align="center"><a href="./lists/listhosts.php" target="mainpart"><big>' . _("Hosts") . '</big></a></td>' . "\n";
 			}