diff --git a/administrator/components/com_associations/src/Controller/AssociationsController.php b/administrator/components/com_associations/src/Controller/AssociationsController.php
index 4ebad5a3cb164..c8e0ac9a4b0a3 100644
--- a/administrator/components/com_associations/src/Controller/AssociationsController.php
+++ b/administrator/components/com_associations/src/Controller/AssociationsController.php
@@ -133,7 +133,8 @@ public function checkin()
 
         $this->setRedirect(
             Route::_('index.php?option=' . $this->option . '&view=' . $this->view_list),
-            Text::_('COM_ASSOCIATIONS_YOU_ARE_NOT_ALLOWED_TO_CHECKIN_THIS_ITEM')
+            Text::_('COM_ASSOCIATIONS_YOU_ARE_NOT_ALLOWED_TO_CHECKIN_THIS_ITEM'),
+            'error'
         );
     }
 }
diff --git a/administrator/components/com_associations/tmpl/associations/default.php b/administrator/components/com_associations/tmpl/associations/default.php
index 290d9c5da1239..bcb7294165602 100644
--- a/administrator/components/com_associations/tmpl/associations/default.php
+++ b/administrator/components/com_associations/tmpl/associations/default.php
@@ -96,7 +96,6 @@
                         </thead>
                         <tbody>
                         <?php foreach ($this->items as $i => $item) :
-                            $canCheckin = true;
                             $canEdit    = AssociationsHelper::allowEdit($this->extensionName, $this->typeName, $item->id);
                             $canCheckin = $canManageCheckin || AssociationsHelper::canCheckinItem($this->extensionName, $this->typeName, $item->id);
                             $isCheckout = AssociationsHelper::isCheckoutItem($this->extensionName, $this->typeName, $item->id);
@@ -109,10 +108,11 @@
                                 <?php endif; ?>
                                 <th scope="row" class="has-context">
                                     <div class="break-word">
+                                        <span hidden><?php echo HTMLHelper::_('grid.id', $i, $item->id); ?></span>
                                         <?php if (isset($item->level)) : ?>
                                             <?php echo LayoutHelper::render('joomla.html.treeprefix', ['level' => $item->level]); ?>
                                         <?php endif; ?>
-                                        <?php if ($canCheckin && $isCheckout) : ?>
+                                        <?php if ($isCheckout) : ?>
                                             <?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'associations.', $canCheckin); ?>
                                         <?php endif; ?>
                                         <?php if ($canEdit) : ?>
@@ -165,7 +165,9 @@
 
                 <?php endif; ?>
 
+                <input type="hidden" name="boxchecked" value="0">
                 <?php echo $this->filterForm->renderControlFields(); ?>
+                <?php echo HTMLHelper::_('form.token'); ?>
             </div>
         </div>
     </div>