diff --git a/supabase/functions/invite-admin-user/index.ts b/supabase/functions/invite-admin-user/index.ts
index b306338..b2c797c 100644
--- a/supabase/functions/invite-admin-user/index.ts
+++ b/supabase/functions/invite-admin-user/index.ts
@@ -47,7 +47,7 @@ Deno.serve(async (req) => {
   const { data, error } = await supabaseAdmin.auth.admin.inviteUserByEmail(email);
   if (error) {
     return new Response(JSON.stringify({ error: error.message }), {
-      status: 500,
+      status: error.status ?? 500,
       headers: { ...corsHeaders, 'Content-Type': 'application/json' },
     });
   }
diff --git a/supabase/functions/list-admin-users/index.ts b/supabase/functions/list-admin-users/index.ts
index 1be50a6..930a030 100644
--- a/supabase/functions/list-admin-users/index.ts
+++ b/supabase/functions/list-admin-users/index.ts
@@ -37,7 +37,7 @@ Deno.serve(async (req) => {
     Deno.env.get('SUPABASE_URL')!,
     Deno.env.get('SUPABASE_SERVICE_ROLE_KEY')!,
   );
-  const { data: { users }, error } = await supabaseAdmin.auth.admin.listUsers();
+  const { data: { users }, error } = await supabaseAdmin.auth.admin.listUsers({ page: 1, perPage: 1000 });
   if (error) {
     return new Response(JSON.stringify({ error: error.message }), {
       status: 500,