diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index f6d7c51b..1a959a4e 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -9,6 +9,7 @@ import { BlockchainIcon } from "~/components/icons/BlockchainIcon"
 import { LaughIcon } from "~/components/icons/LaughIcon"
 import { Button } from "~/components/ui/Button"
 import { useAccountState, useConnectModal } from "@crossbell/connect-kit"
+import { useRefCallback } from "@crossbell/util-hooks"
 import { useRouter } from "next/router"
 import { GITHUB_LINK, APP_NAME, CSB_SCAN } from "~/lib/env"
 import { getSiteLink } from "~/lib/helpers"
@@ -127,6 +128,15 @@ export default function Home({ region }: { region: string | null }) {
   const userSite = useAccountSites()
   const subscribeToSites = useSubscribeToSites()
 
+  const doSubscribeToSites = useRefCallback(() => {
+    subscribeToSites.mutate({
+      characterIds: showcaseSites.data
+        ?.map((s: { characterId?: string }) => s.characterId)
+        .filter(Boolean)
+        .map(Number),
+    })
+  })
+
   const followAll = async () => {
     if (!isConnected) {
       setFollowProgress(true)
@@ -134,10 +144,7 @@ export default function Home({ region }: { region: string | null }) {
     } else if (!userSite.data?.[0]) {
       router.push(`${SITE_URL}/dashboard/new-site`)
     } else {
-      subscribeToSites.mutate({
-        user: userSite.data?.[0],
-        sites: showcaseSites.data,
-      })
+      doSubscribeToSites()
     }
   }
 
@@ -152,10 +159,7 @@ export default function Home({ region }: { region: string | null }) {
       if (!userSite.data) {
         router.push(`${SITE_URL}/dashboard/new-site`)
       }
-      subscribeToSites.mutate({
-        user: userSite.data?.[0],
-        sites: showcaseSites.data,
-      })
+      doSubscribeToSites()
       setFollowProgress(false)
     }
   }, [
@@ -167,6 +171,7 @@ export default function Home({ region }: { region: string | null }) {
     showcaseSites.isSuccess,
     showcaseSites.data,
     subscribeToSites,
+    doSubscribeToSites,
   ])
 
   return (
diff --git a/src/queries/site.ts b/src/queries/site.ts
index edb923cf..5263e405 100644
--- a/src/queries/site.ts
+++ b/src/queries/site.ts
@@ -1,6 +1,6 @@
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query"
 import { useContract } from "@crossbell/contract"
-import { useAccountState } from "@crossbell/connect-kit"
+import { useAccountState, useFollowCharacters } from "@crossbell/connect-kit"
 
 import * as siteModel from "~/models/site.model"
 import { useUnidata } from "./unidata"
@@ -143,31 +143,28 @@ export function useSubscribeToSite() {
 }
 
 export function useSubscribeToSites() {
-  const contract = useContract()
   const queryClient = useQueryClient()
-  return useMutation(
-    async (input: Parameters<typeof siteModel.subscribeToSites>[0]) => {
-      // FIXME: - Support email users
-      return siteModel.subscribeToSites(input, contract)
-    },
-    {
-      onSuccess: (data, variables) =>
-        Promise.all(
-          variables.sites.flatMap((site) => [
-            queryClient.invalidateQueries([
-              "useGetSiteSubscriptions",
-              site.characterId,
-            ]),
-
-            queryClient.invalidateQueries([
-              "getSubscription",
-              site.characterId,
-              variables.user.metadata?.proof,
-            ]),
-          ]),
-        ),
-    },
+  const currentCharacterId = useAccountState(
+    (s) => s.computed.account?.characterId,
   )
+
+  return useFollowCharacters({
+    onSuccess: (_, { characterIds = [] }) =>
+      Promise.all(
+        characterIds.flatMap((characterId) => [
+          queryClient.invalidateQueries([
+            "useGetSiteSubscriptions",
+            characterId,
+          ]),
+
+          queryClient.invalidateQueries([
+            "getSubscription",
+            characterId,
+            currentCharacterId,
+          ]),
+        ]),
+      ),
+  })
 }
 
 export function useUnsubscribeFromSite() {