diff --git a/views/bootstrap/class.DocumentNotify.php b/views/bootstrap/class.DocumentNotify.php
index a6463abcf..2404ec5e6 100644
--- a/views/bootstrap/class.DocumentNotify.php
+++ b/views/bootstrap/class.DocumentNotify.php
@@ -151,10 +151,10 @@ $(document).ready( function() {
 		} else {
 			print "<table class=\"table table-condensed table-sm mt-4\">\n";
 			foreach ($notifyList["users"] as $userNotify) {
-				print "<tr>";
-				print "<td><i class=\"fa fa-user\"></i></td>";
-				print "<td>" . htmlspecialchars($userNotify->getLogin() . " - " . $userNotify->getFullName()) . "</td>";
 				if ($user->isAdmin() || $user->getID() == $userNotify->getID()) {
+					print "<tr>";
+					print "<td><i class=\"fa fa-user\"></i></td>";
+					print "<td>" . htmlspecialchars($userNotify->getLogin() . " - " . $userNotify->getFullName()) . "</td>";
 					print "<form action=\"../op/op.DocumentNotify.php\" method=\"post\">\n";
 					echo createHiddenFieldWithKey('documentnotify')."\n";
 					print "<input type=\"hidden\" name=\"documentid\" value=\"".$document->getID()."\">\n";
@@ -164,14 +164,14 @@ $(document).ready( function() {
 					print "<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
-				}else print "<td></td>";
-				print "</tr>";
+					print "</tr>";
+				}
 			}
 			foreach ($notifyList["groups"] as $groupNotify) {
-				print "<tr>";
-				print "<td><i class=\"fa fa-group\"></i></td>";
-				print "<td>" . htmlspecialchars($groupNotify->getName()) . "</td>";
 				if ($user->isAdmin() || $groupNotify->isMember($user,true)) {
+					print "<tr>";
+					print "<td><i class=\"fa fa-group\"></i></td>";
+					print "<td>" . htmlspecialchars($groupNotify->getName()) . "</td>";
 					print "<form action=\"../op/op.DocumentNotify.php\" method=\"post\">\n";
 					echo createHiddenFieldWithKey('documentnotify')."\n";
 					print "<input type=\"hidden\" name=\"documentid\" value=\"".$document->getID()."\">\n";
@@ -181,8 +181,8 @@ $(document).ready( function() {
 					print "<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
-				}else print "<td></td>";
-				print "</tr>";
+					print "</tr>";
+				}
 			}
 			print "</table>\n";
 		}
diff --git a/views/bootstrap/class.FolderNotify.php b/views/bootstrap/class.FolderNotify.php
index 56a7a5961..ada8b3d4e 100644
--- a/views/bootstrap/class.FolderNotify.php
+++ b/views/bootstrap/class.FolderNotify.php
@@ -151,10 +151,10 @@ $(document).ready(function() {
 		} else {
 			print "<table class=\"table table-condensed table-sm\">\n";
 			foreach ($notifyList["users"] as $userNotify) {
-				print "<tr>";
-				print "<td><i class=\"fa fa-user\"></i></td>";
-				print "<td>" . htmlspecialchars($userNotify->getLogin() . " - " . $userNotify->getFullName()) . "</td>";
 				if ($user->isAdmin() || $user->getID() == $userNotify->getID()) {
+					print "<tr>";
+					print "<td><i class=\"fa fa-user\"></i></td>";
+					print "<td>" . htmlspecialchars($userNotify->getLogin() . " - " . $userNotify->getFullName()) . "</td>";
 					print "<form action=\"../op/op.FolderNotify.php\" method=\"post\">\n";
 					echo createHiddenFieldWithKey('foldernotify')."\n";
 					print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
@@ -164,14 +164,14 @@ $(document).ready(function() {
 					print "<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
-				}else print "<td></td>";
-				print "</tr>";
+					print "</tr>";
+				}
 			}
 			foreach ($notifyList["groups"] as $groupNotify) {
-				print "<tr>";
-				print "<td><i class=\"fa fa-group\"></i></td>";
-				print "<td>" . htmlspecialchars($groupNotify->getName()) . "</td>";
 				if ($user->isAdmin() || $groupNotify->isMember($user,true)) {
+					print "<tr>";
+					print "<td><i class=\"fa fa-group\"></i></td>";
+					print "<td>" . htmlspecialchars($groupNotify->getName()) . "</td>";
 					print "<form action=\"../op/op.FolderNotify.php\" method=\"post\">\n";
 					echo createHiddenFieldWithKey('foldernotify')."\n";
 					print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
@@ -181,8 +181,8 @@ $(document).ready(function() {
 					print "<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
-				}else print "<td></td>";
-				print "</tr>";
+					print "</tr>";
+				}
 			}
 			print "</table>\n";
 		}