diff --git a/.eslintrc.js b/.eslintrc.js
index f9bc8cc2..8dfdd6b3 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -21,6 +21,7 @@ module.exports = {
     },
   ],
   rules: {
+    'no-console': 'off',
     'vue/multi-word-component-names': 'off',
     'vue/require-default-prop': 'off',
   },
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 37ba642f..11c26e0e 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -25,6 +25,8 @@ export default defineNuxtConfig({
 
   sourcemap: false,
 
+  typescript: { strict: true },
+
   srcDir: 'src',
 
   build: {
@@ -45,7 +47,7 @@ export default defineNuxtConfig({
       routes: ['/', '/uses', '/og/og.jpg'],
     },
     hooks: {
-      'prerender:generate'(route) {
+      'prerender:generate' (route) {
         if (route.error) {
           process.exit(1)
         }
@@ -95,13 +97,13 @@ export default defineNuxtConfig({
           '/fonts/barlow-7cHpv4kjgoGqM7E_DMs5.woff2',
         ].map(
           href =>
-            ({
-              rel: 'preload',
-              as: 'font',
-              type: 'font/woff2',
-              crossorigin: '',
-              href,
-            } as const)
+          ({
+            rel: 'preload',
+            as: 'font',
+            type: 'font/woff2',
+            crossorigin: '',
+            href,
+          } as const)
         ),
         { rel: 'mask-icon', color: '#fff', href: '/favicon.svg' },
         { rel: 'icon', type: 'image/svg', href: '/favicon.svg' },
diff --git a/src/components/layout/TheSiteHeader.vue b/src/components/layout/TheSiteHeader.vue
index f5066d54..f83b6a44 100644
--- a/src/components/layout/TheSiteHeader.vue
+++ b/src/components/layout/TheSiteHeader.vue
@@ -3,7 +3,7 @@ const config = useRuntimeConfig()
 const redirect = process.dev
   ? `&redirect_uri=http://localhost:3000/auth/github`
   : ''
-const loginURL = `https://github.com/login/oauth/authorize?client_id=${config.public.githubClientId}${redirect}`
+const loginURL = `https://github.com/login/oauth/authorize?client_id=${config.public.githubClientId}${redirect}&scope=read:org`
 </script>
 
 <template>
diff --git a/src/server/routes/auth/[...provider].get.ts b/src/server/routes/auth/[...provider].get.ts
index 187fd8fa..a63e933c 100644
--- a/src/server/routes/auth/[...provider].get.ts
+++ b/src/server/routes/auth/[...provider].get.ts
@@ -15,7 +15,7 @@ export default defineEventHandler(async event => {
   }
 
   const config = useRuntimeConfig()
-  const { access_token } = await $fetch(
+  const { access_token } = await $fetch<{ access_token: string }>(
     'https://github.com/login/oauth/access_token',
     {
       method: 'POST',
@@ -27,14 +27,18 @@ export default defineEventHandler(async event => {
     }
   ).catch(err => {
     console.error('access', err)
-    return {}
+    return {} as { access_token?: string }
   })
 
   if (access_token) {
     // Determine if user is a sponsor
     const [viewer, ids] = await Promise.all([
-      query(access_token, 'query { viewer { id, name, avatarUrl } }')
-        .then(r => r.data.viewer)
+      query(access_token, organisationQuery)
+        .then(r => {
+          const viewer = r.data?.viewer || {}
+          viewer.orgs = viewer.organizations.edges.map(e => e.node.id) || []
+          return viewer
+        })
         .catch(err => {
           console.error('viewer', err)
           return {}
@@ -48,14 +52,16 @@ export default defineEventHandler(async event => {
     ])
 
     console.info({
-      sponsor: ids.includes(viewer.id),
+      sponsor:
+        ids.includes(viewer.id) || ids.some(i => viewer.orgs.includes(i)),
       avatar: viewer.avatarUrl,
       name: viewer.name,
     })
 
     // set custom JWT claim
     await loginUser(event, {
-      sponsor: ids.includes(viewer.id),
+      sponsor:
+        ids.includes(viewer.id) || ids.some(i => viewer.orgs.includes(i)),
       avatar: viewer.avatarUrl,
       name: viewer.name,
     })
@@ -63,3 +69,18 @@ export default defineEventHandler(async event => {
 
   return sendRedirect(event, '/')
 })
+
+const organisationQuery = `{
+  viewer {
+    id
+    name
+    avatarUrl
+    organizations(first: 100) {
+      edges {
+        node {
+          id
+        }
+      }
+    }
+  }
+}`
diff --git a/src/server/utils/github.ts b/src/server/utils/github.ts
index db3ec43a..62438526 100644
--- a/src/server/utils/github.ts
+++ b/src/server/utils/github.ts
@@ -1,5 +1,5 @@
 export const query = (accessToken: string, query: string) =>
-  $fetch('https://api.github.com/graphql', {
+  $fetch<{ data: any }>('https://api.github.com/graphql', {
     method: 'POST',
     headers: { Authorization: `Bearer ${accessToken}` },
     body: { query },
diff --git a/src/server/utils/sponsors.ts b/src/server/utils/sponsors.ts
index 750c365b..41222d45 100644
--- a/src/server/utils/sponsors.ts
+++ b/src/server/utils/sponsors.ts
@@ -38,7 +38,7 @@ export async function getSponsors (): Promise<Sponsor[]> {
     entry.mtime = Date.now()
     useStorage()
       .setItem('sponsors', entry)
-      .catch(error => console.error('[nitro] [cache]', error))
+      .catch((error: any) => console.error('[nitro] [cache]', error))
   }
 
   return entry.value