diff --git a/notify.module b/notify.module
index ad7a678..1c222c2 100644
--- a/notify.module
+++ b/notify.module
@@ -330,7 +330,11 @@ function notify_admin_users() {
 
   $form['users'] = array();
 
-  $result = db_query('SELECT u.uid, u.name, u.mail, n.* FROM {users} u LEFT JOIN {notify} n ON u.uid = n.uid WHERE n.status = 1 AND u.status = 1 ORDER BY u.name');
+  // Add pagination query to enhance list display
+  $sql = 'SELECT u.uid, u.name, u.mail, n.* FROM {users} u LEFT JOIN {notify} n ON u.uid = n.uid WHERE n.status = 1 AND u.status = 1 ORDER BY u.name';
+  $query_count = 'SELECT COUNT(u.uid) FROM {users} u LEFT JOIN {notify} n ON u.uid = n.uid WHERE n.status = 1 AND u.status = 1 ORDER BY u.name';
+  $result = pager_query($sql, 100, 0, $query_count);
+
   while ($notify = db_fetch_object($result)) {
     $form['users'][$notify->uid] = array();
     $form['users'][$notify->uid]['name'] = array('#type' => 'markup', '#value' => theme('username', $notify));
@@ -341,6 +345,9 @@ function notify_admin_users() {
     $form['users'][$notify->uid]['attempts'] = array('#type' => 'textfield', '#size' => 2,  '#default_value' => $notify->attempts ? intval($notify->attempts) : 0);
   }
 
+  // Add theme pager after table
+  $form['pager'] = array('#value' => theme('pager', NULL, 100, 0));
+
   $form['flush'] = array(
     '#title' => t('Flush e-mail queue'),
     '#type' => 'checkbox',