diff --git a/administrator/components/com_admin/tmpl/help/default.php b/administrator/components/com_admin/tmpl/help/default.php
index 04b039ded14a2..3e79adb7b8dc6 100644
--- a/administrator/components/com_admin/tmpl/help/default.php
+++ b/administrator/components/com_admin/tmpl/help/default.php
@@ -12,34 +12,30 @@
 use Joomla\CMS\Help\Help;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Router\Route;
 
 /** @var \Joomla\Component\Admin\Administrator\View\Help\HtmlView $this */
 
 ?>
-<form action="<?php echo Route::_('index.php?option=com_admin&amp;view=help'); ?>" method="post" name="adminForm" id="adminForm">
-	<div class="row">
-		<div id="sidebar" class="col-md-3">
-			<div class="sidebar-nav">
-				<ul class="nav flex-column">
-					<li><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_START_HERE'), Text::_('COM_ADMIN_START_HERE'), ['target' => 'helpFrame']); ?></li>
-					<li><?php echo HTMLHelper::_('link', $this->latestVersionCheck, Text::_('COM_ADMIN_LATEST_VERSION_CHECK'), ['target' => 'helpFrame']); ?></li>
-					<li><?php echo HTMLHelper::_('link', 'https://www.gnu.org/licenses/gpl-2.0.html', Text::_('COM_ADMIN_LICENSE'), ['target' => 'helpFrame']); ?></li>
-					<li><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_GLOSSARY'), Text::_('COM_ADMIN_GLOSSARY'), ['target' => 'helpFrame']); ?></li>
-					<li class="divider"></li>
-					<li class="nav-header"><?php echo Text::_('COM_ADMIN_ALPHABETICAL_INDEX'); ?></li>
-					<?php foreach ($this->toc as $k => $v) : ?>
-						<li>
-							<?php $url = Help::createUrl('JHELP_' . strtoupper($k)); ?>
-							<?php echo HTMLHelper::_('link', $url, $v, ['target' => 'helpFrame']); ?>
-						</li>
-					<?php endforeach; ?>
-				</ul>
-			</div>
-		</div>
-		<div class="col-md-9">
-			<iframe name="helpFrame" title="helpFrame" height="2100px" src="<?php echo $this->page; ?>" class="helpFrame table table-bordered"></iframe>
+<div class="row">
+	<div id="sidebar" class="col-md-3">
+		<div class="sidebar-nav">
+			<ul class="nav flex-column">
+				<li><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_START_HERE'), Text::_('COM_ADMIN_START_HERE'), ['target' => 'helpFrame']); ?></li>
+				<li><?php echo HTMLHelper::_('link', $this->latestVersionCheck, Text::_('COM_ADMIN_LATEST_VERSION_CHECK'), ['target' => 'helpFrame']); ?></li>
+				<li><?php echo HTMLHelper::_('link', 'https://www.gnu.org/licenses/gpl-2.0.html', Text::_('COM_ADMIN_LICENSE'), ['target' => 'helpFrame']); ?></li>
+				<li><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_GLOSSARY'), Text::_('COM_ADMIN_GLOSSARY'), ['target' => 'helpFrame']); ?></li>
+				<li class="divider"></li>
+				<li class="nav-header"><?php echo Text::_('COM_ADMIN_ALPHABETICAL_INDEX'); ?></li>
+				<?php foreach ($this->toc as $k => $v) : ?>
+					<li>
+						<?php $url = Help::createUrl('JHELP_' . strtoupper($k)); ?>
+						<?php echo HTMLHelper::_('link', $url, $v, ['target' => 'helpFrame']); ?>
+					</li>
+				<?php endforeach; ?>
+			</ul>
 		</div>
 	</div>
-	<input class="textarea" type="hidden" name="option" value="com_admin">
-</form>
+	<div class="col-md-9">
+		<iframe name="helpFrame" title="helpFrame" height="2100px" src="<?php echo $this->page; ?>" class="helpFrame table table-bordered"></iframe>
+	</div>
+</div>
diff --git a/administrator/components/com_postinstall/src/Controller/MessageController.php b/administrator/components/com_postinstall/src/Controller/MessageController.php
index ddd9e6db01521..ff99e3f09bc97 100644
--- a/administrator/components/com_postinstall/src/Controller/MessageController.php
+++ b/administrator/components/com_postinstall/src/Controller/MessageController.php
@@ -32,6 +32,7 @@ class MessageController extends BaseController
 	 */
 	public function reset()
 	{
+		// Check for request forgeries
 		$this->checkToken();
 
 		/** @var MessagesModel $model */
@@ -58,6 +59,9 @@ public function reset()
 	 */
 	public function unpublish()
 	{
+		// Check for request forgeries
+		$this->checkToken();
+
 		$model = $this->getModel('Messages', '', array('ignore_request' => true));
 
 		$id = $this->input->get('id');
@@ -84,6 +88,7 @@ public function unpublish()
 	 */
 	public function action()
 	{
+		// Check for request forgeries
 		$this->checkToken();
 
 		$model = $this->getModel('Messages', '', array('ignore_request' => true));
@@ -130,6 +135,7 @@ public function action()
 	 */
 	public function hideAll()
 	{
+		// Check for request forgeries
 		$this->checkToken();
 
 		/** @var MessagesModel $model */
diff --git a/components/com_contact/tmpl/category/default_items.php b/components/com_contact/tmpl/category/default_items.php
index 45985345c96f1..278758b0dfa45 100644
--- a/components/com_contact/tmpl/category/default_items.php
+++ b/components/com_contact/tmpl/category/default_items.php
@@ -155,6 +155,7 @@ class="inputbox" onchange="document.adminForm.submit();"
 			<div>
 				<input type="hidden" name="filter_order" value="<?php echo $this->escape($this->state->get('list.ordering')); ?>">
 				<input type="hidden" name="filter_order_Dir" value="<?php echo $this->escape($this->state->get('list.direction')); ?>">
+				<?php echo HTMLHelper::_('form.token'); ?>
 			</div>
 	</form>
 </div>
diff --git a/components/com_contact/tmpl/featured/default_items.php b/components/com_contact/tmpl/featured/default_items.php
index 3dcda1f3ae3b3..9c7c5fb21b2e3 100644
--- a/components/com_contact/tmpl/featured/default_items.php
+++ b/components/com_contact/tmpl/featured/default_items.php
@@ -170,7 +170,7 @@
 				<?php endforeach; ?>
 			</tbody>
 		</table>
-
+		<?php echo HTMLHelper::_('form.token'); ?>
 	</form>
 	<?php endif; ?>
 </div>
diff --git a/components/com_content/tmpl/archive/default.php b/components/com_content/tmpl/archive/default.php
index 45c34ab296cff..3bb598a81b005 100644
--- a/components/com_content/tmpl/archive/default.php
+++ b/components/com_content/tmpl/archive/default.php
@@ -9,6 +9,7 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -46,6 +47,7 @@
 		<input type="hidden" name="view" value="archive">
 		<input type="hidden" name="option" value="com_content">
 		<input type="hidden" name="limitstart" value="0">
+		<?php echo HTMLHelper::_('form.token'); ?>
 	</div>
 	<br>
 	</fieldset>
diff --git a/components/com_content/tmpl/category/default_articles.php b/components/com_content/tmpl/category/default_articles.php
index 53aed65489830..58706813b16d8 100644
--- a/components/com_content/tmpl/category/default_articles.php
+++ b/components/com_content/tmpl/category/default_articles.php
@@ -101,6 +101,7 @@
 		<input type="hidden" name="filter_order_Dir" value="">
 		<input type="hidden" name="limitstart" value="">
 		<input type="hidden" name="task" value="">
+		<?php echo HTMLHelper::_('form.token'); ?>
 	</fieldset>
 
 	<div class="com-content-category__filter-submit control-group hidden-xs-up float-right">
diff --git a/components/com_newsfeeds/tmpl/category/default_items.php b/components/com_newsfeeds/tmpl/category/default_items.php
index 451b55290c49e..bc8b9cc79e7bb 100644
--- a/components/com_newsfeeds/tmpl/category/default_items.php
+++ b/components/com_newsfeeds/tmpl/category/default_items.php
@@ -9,6 +9,7 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\String\PunycodeHelper;
@@ -98,6 +99,7 @@
 					</div>
 				<?php endif; ?>
 			<?php endif; ?>
+			<?php echo HTMLHelper::_('form.token'); ?>
 		</form>
 	<?php endif; ?>
 </div>
diff --git a/components/com_tags/tmpl/tag/default_items.php b/components/com_tags/tmpl/tag/default_items.php
index bedaabdee9f2c..4dd7ed1ea4629 100644
--- a/components/com_tags/tmpl/tag/default_items.php
+++ b/components/com_tags/tmpl/tag/default_items.php
@@ -60,7 +60,6 @@
 			<input type="hidden" name="filter_order" value="">
 			<input type="hidden" name="filter_order_Dir" value="">
 			<input type="hidden" name="limitstart" value="">
-			<input type="hidden" name="task" value="">
 		</fieldset>
 	<?php endif; ?>
 
diff --git a/components/com_tags/tmpl/tag/list_items.php b/components/com_tags/tmpl/tag/list_items.php
index 965ef230fcf67..a2beba5b940ce 100644
--- a/components/com_tags/tmpl/tag/list_items.php
+++ b/components/com_tags/tmpl/tag/list_items.php
@@ -52,7 +52,6 @@
 			<input type="hidden" name="filter_order" value="">
 			<input type="hidden" name="filter_order_Dir" value="">
 			<input type="hidden" name="limitstart" value="">
-			<input type="hidden" name="task" value="">
 		</fieldset>
 	<?php endif; ?>
 
diff --git a/components/com_tags/tmpl/tags/default_items.php b/components/com_tags/tmpl/tags/default_items.php
index 9e57e294b3a6d..b2b94bb13d95e 100644
--- a/components/com_tags/tmpl/tags/default_items.php
+++ b/components/com_tags/tmpl/tags/default_items.php
@@ -80,6 +80,7 @@
 				<input type="hidden" name="filter_order_Dir" value="">
 				<input type="hidden" name="limitstart" value="">
 				<input type="hidden" name="task" value="">
+				<?php echo HTMLHelper::_('form.token'); ?>
 			</fieldset>
 		</form>
 	<?php endif; ?>