diff --git a/templates/Users/index.php b/templates/Users/index.php
index d06578c..6fae052 100644
--- a/templates/Users/index.php
+++ b/templates/Users/index.php
@@ -108,7 +108,7 @@ echo $this->element('genericElements/IndexTable/index_table', [
         ],
         'title' => __('User index'),
         'description' => __('The list of enrolled users in this Cerebrate instance. All of the users have or at one point had access to the system.'),
-        'pull' => 'right',
+        'includeAllPagination' => true,
         'actions' => [
             [
                 'url' => '/users/view',
diff --git a/templates/element/genericElements/ListTopBar/group_table_action.php b/templates/element/genericElements/ListTopBar/group_table_action.php
index ef14480..7a4df9b 100644
--- a/templates/element/genericElements/ListTopBar/group_table_action.php
+++ b/templates/element/genericElements/ListTopBar/group_table_action.php
@@ -63,6 +63,7 @@ $numberOfElementHtml = $this->element('/genericElements/ListTopBar/group_table_a
     'tableSettings' => $tableSettings,
     'table_setting_id' => $data['table_setting_id'],
     'numberOfElement' => $numberOfElement,
+    'includeAll' =>  !empty($table_data['includeAllPagination']),
 ]);
 ?>
 <?php if (!isset($data['requirement']) || $data['requirement']) : ?>
diff --git a/templates/element/genericElements/ListTopBar/group_table_action/numberOfElement.php b/templates/element/genericElements/ListTopBar/group_table_action/numberOfElement.php
index e3913d1..37104bd 100644
--- a/templates/element/genericElements/ListTopBar/group_table_action/numberOfElement.php
+++ b/templates/element/genericElements/ListTopBar/group_table_action/numberOfElement.php
@@ -10,7 +10,9 @@ $numberOfElementSelectSeed = 'seed-' . mt_rand();
         <option value="50" <?= $numberOfElement == 50 ? 'selected' : '' ?>><?= __('50') ?></option>
         <option value="100" <?= $numberOfElement == 100 ? 'selected' : '' ?>><?= __('100') ?></option>
         <option value="200" <?= $numberOfElement == 200 ? 'selected' : '' ?>><?= __('200') ?></option>
-        <option value="all" <?= $numberOfElement == 'all' ? 'selected' : '' ?>><?= __('All') ?></option>
+        <?php if (!empty($includeAll)): ?>
+            <option value="all" <?= $numberOfElement == 'all' ? 'selected' : '' ?>><?= __('All') ?></option>
+        <?php endif; ?>
     </select>
 </label>