diff --git a/packages/site/src/lib/supabase/cached-query-data.ts b/packages/site/src/lib/supabase/cached-query-data.ts
index c72f664c2..06444d349 100644
--- a/packages/site/src/lib/supabase/cached-query-data.ts
+++ b/packages/site/src/lib/supabase/cached-query-data.ts
@@ -27,6 +27,8 @@ export function cached_query_data_store<T extends { id?: string, user_id?: strin
   const month_year = new Date().toLocaleDateString('default', { month: '2-digit', year: 'numeric' }).replace('/', '.')
   const cache_key = `${key}_${mode}_${month_year}`
   let timestamp_from_which_to_fetch_data = '1971-01-01T00:00:00Z'
+  let range_start = 0
+  const limit = 1000
 
   async function get_data_from_cache_then_db(refresh = false) {
     if (log)
@@ -44,7 +46,13 @@ export function cached_query_data_store<T extends { id?: string, user_id?: strin
         timestamp_from_which_to_fetch_data = cached_or_materialized[cached_or_materialized.length - 1][order_field] as string
       const query = materialized_query
         .order(order_field, { ascending: true })
-        .gt(order_field, timestamp_from_which_to_fetch_data)
+
+      if (order_field === 'id') {
+        query.range(range_start, range_start + limit)
+        range_start += limit
+      } else {
+        query.gt(order_field, timestamp_from_which_to_fetch_data)
+      }
       // if (!cached_data?.length) {
       //   query.is('deleted', null)
       // }
@@ -77,7 +85,14 @@ export function cached_query_data_store<T extends { id?: string, user_id?: strin
       const query = live_query
         .limit(1000)
         .order(order_field, { ascending: true })
-        .gt(order_field, timestamp_from_which_to_fetch_data)
+
+      if (order_field === 'id') {
+        query.range(range_start, range_start + limit)
+        range_start += limit
+      } else {
+        query.gt(order_field, timestamp_from_which_to_fetch_data)
+      }
+
       // if (!cached_or_materialized?.length) {
       //   query.is('deleted', null)
       // }
diff --git a/packages/site/src/routes/admin/+layout.svelte b/packages/site/src/routes/admin/+layout.svelte
index ba9c350ad..d3f5c4564 100644
--- a/packages/site/src/routes/admin/+layout.svelte
+++ b/packages/site/src/routes/admin/+layout.svelte
@@ -29,7 +29,7 @@
           await data.public_dictionaries.reset()
           await data.other_dictionaries.reset()
           await data.dictionary_roles.reset()
-          await data.users.refresh()
+          await data.users.reset()
           location.reload()
         }}>Reset cache (after public/private toggle, remove editor)</Button>
     </nav>
diff --git a/packages/site/src/routes/admin/+layout.ts b/packages/site/src/routes/admin/+layout.ts
index e82da76f6..aa03dc673 100644
--- a/packages/site/src/routes/admin/+layout.ts
+++ b/packages/site/src/routes/admin/+layout.ts
@@ -45,6 +45,7 @@ export const load = (async ({ parent }) => {
     live_query: supabase.rpc('users_for_admin_table')
       .select(),
     key: 'users',
+    order_field: 'id',
   })
 
   const dictionary_roles = cached_query_data_store<Tables<'dictionary_roles'>>({
diff --git a/supabase/migrations/20250225151251_able-to-delete-users.sql b/supabase/migrations/20250225151251_able-to-delete-users.sql
new file mode 100644
index 000000000..30450aaec
--- /dev/null
+++ b/supabase/migrations/20250225151251_able-to-delete-users.sql
@@ -0,0 +1,8 @@
+ALTER TABLE user_data
+DROP CONSTRAINT user_data_id_fkey;
+
+ALTER TABLE user_data
+ADD CONSTRAINT user_data_id_fkey 
+FOREIGN KEY (id) 
+REFERENCES auth.users(id)
+ON DELETE CASCADE;
\ No newline at end of file
diff --git a/supabase/summarized-migrations.sql b/supabase/summarized-migrations.sql
index b1edca047..ea63f4e4c 100644
--- a/supabase/summarized-migrations.sql
+++ b/supabase/summarized-migrations.sql
@@ -723,7 +723,7 @@ FROM auth.users;
 REVOKE ALL ON public.profiles_view FROM anon, authenticated, public;
 
 CREATE TABLE user_data (
-  id uuid references auth.users not null primary key,
+  id uuid references auth.users not null primary key ON DELETE CASCADE,
   updated_at timestamp with time zone DEFAULT now() NOT NULL,
   welcome_email_sent timestamp with time zone,
   unsubscribed_from_emails timestamp with time zone,