diff --git a/src/__mocks__/handlers/user/createUser.mock.ts b/src/__mocks__/handlers/user/createUser.mock.ts
deleted file mode 100644
index 0ff2368c..00000000
--- a/src/__mocks__/handlers/user/createUser.mock.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { HttpResponse } from "msw";
-
-import { mockCreateUserMutation } from "generated/graphql.mock";
-
-/**
- * Create user mutation (success) mock.
- */
-export const mockCreateUserMutationSuccess = mockCreateUserMutation(
-  ({ variables }) => {
-    const { hidraId, username, firstName, lastName } = variables;
-
-    return HttpResponse.json({
-      data: {
-        createUser: {
-          id: "1dc43c0f-5140-43e9-a646-b144305d7787",
-          hidraId,
-          firstName,
-          lastName,
-          username,
-        },
-      },
-    });
-  },
-);
-
-// TODO mock error as well
-// export const mockCreateUserMutationError = mockCreateUserQuery(({ variables }) => {});
diff --git a/src/__mocks__/handlers/user/index.ts b/src/__mocks__/handlers/user/index.ts
index cb260caf..a71370e7 100644
--- a/src/__mocks__/handlers/user/index.ts
+++ b/src/__mocks__/handlers/user/index.ts
@@ -1,2 +1 @@
-export * from "./createUser.mock";
 export * from "./user.mock";
diff --git a/src/app/organizations/[organizationSlug]/(manage)/layout.tsx b/src/app/organizations/[organizationSlug]/(manage)/layout.tsx
index 501a00e2..d912ef6a 100644
--- a/src/app/organizations/[organizationSlug]/(manage)/layout.tsx
+++ b/src/app/organizations/[organizationSlug]/(manage)/layout.tsx
@@ -25,8 +25,6 @@ const ManageOrganizationLayout = async ({ params, children }: Props) => {
 
   const session = await auth();
 
-  if (!session) notFound();
-
   const organization = await getOrganization({ organizationSlug });
 
   if (!organization) notFound();
@@ -38,22 +36,26 @@ const ManageOrganizationLayout = async ({ params, children }: Props) => {
       queryKey: useOrganizationQuery.getKey({ slug: organizationSlug }),
       queryFn: useOrganizationQuery.fetcher({ slug: organizationSlug }),
     }),
-    queryClient.prefetchQuery({
-      queryKey: useOrganizationRoleQuery.getKey({
-        userId: session.user.rowId!,
-        organizationId: organization.rowId,
-      }),
-      queryFn: useOrganizationRoleQuery.fetcher({
-        userId: session.user.rowId!,
-        organizationId: organization.rowId,
-      }),
-    }),
+    ...(session
+      ? [
+          queryClient.prefetchQuery({
+            queryKey: useOrganizationRoleQuery.getKey({
+              userId: session.user.rowId!,
+              organizationId: organization.rowId,
+            }),
+            queryFn: useOrganizationRoleQuery.fetcher({
+              userId: session.user.rowId!,
+              organizationId: organization.rowId,
+            }),
+          }),
+        ]
+      : []),
   ]);
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
       <HStack h="full" w="full" gap={0}>
-        <ManagementSidebar user={session.user}>{children}</ManagementSidebar>
+        <ManagementSidebar user={session?.user}>{children}</ManagementSidebar>
       </HStack>
     </HydrationBoundary>
   );
diff --git a/src/app/organizations/[organizationSlug]/(manage)/members/page.tsx b/src/app/organizations/[organizationSlug]/(manage)/members/page.tsx
index 9d402d74..1b6e755a 100644
--- a/src/app/organizations/[organizationSlug]/(manage)/members/page.tsx
+++ b/src/app/organizations/[organizationSlug]/(manage)/members/page.tsx
@@ -21,6 +21,7 @@ import { getSdk } from "lib/graphql";
 import { getQueryClient, getSearchParams } from "lib/util";
 import { DialogType } from "store";
 
+import type { Member } from "generated/graphql";
 import type { SearchParams } from "nuqs/server";
 
 export const generateMetadata = async ({ params }: Props) => {
@@ -50,8 +51,6 @@ const OrganizationMembersPage = async ({ params, searchParams }: Props) => {
 
   const session = await auth();
 
-  if (!session) notFound();
-
   const organization = await getOrganization({
     organizationSlug,
   });
@@ -60,12 +59,17 @@ const OrganizationMembersPage = async ({ params, searchParams }: Props) => {
 
   const sdk = getSdk({ session });
 
-  const { memberByUserIdAndOrganizationId: member } =
-    await sdk.OrganizationRole({
-      userId: session.user.rowId!,
+  let member: Partial<Member> | null = null;
+
+  if (session) {
+    const { memberByUserIdAndOrganizationId } = await sdk.OrganizationRole({
+      userId: session?.user.rowId!,
       organizationId: organization.rowId,
     });
 
+    member = memberByUserIdAndOrganizationId ?? null;
+  }
+
   const queryClient = getQueryClient();
 
   const { search, roles } = await getSearchParams.parse(searchParams);
@@ -95,16 +99,20 @@ const OrganizationMembersPage = async ({ params, searchParams }: Props) => {
         excludeRoles: [Role.Owner],
       }),
     }),
-    queryClient.prefetchQuery({
-      queryKey: useOrganizationRoleQuery.getKey({
-        organizationId: organization.rowId,
-        userId: session.user.rowId!,
-      }),
-      queryFn: useOrganizationRoleQuery.fetcher({
-        organizationId: organization.rowId,
-        userId: session.user.rowId!,
-      }),
-    }),
+    ...(session
+      ? [
+          queryClient.prefetchQuery({
+            queryKey: useOrganizationRoleQuery.getKey({
+              organizationId: organization.rowId,
+              userId: session.user.rowId!,
+            }),
+            queryFn: useOrganizationRoleQuery.fetcher({
+              organizationId: organization.rowId,
+              userId: session.user.rowId!,
+            }),
+          }),
+        ]
+      : []),
   ]);
 
   return (
@@ -132,7 +140,7 @@ const OrganizationMembersPage = async ({ params, searchParams }: Props) => {
 
         <MembershipFilters />
 
-        <Members user={session.user} organizationId={organization.rowId} />
+        <Members user={session?.user} organizationId={organization.rowId} />
 
         {/* dialogs */}
         {/* TODO: allow adding owners when transferring ownership is resolved. Restricting to single ownership for now. */}
diff --git a/src/app/organizations/[organizationSlug]/(manage)/settings/page.tsx b/src/app/organizations/[organizationSlug]/(manage)/settings/page.tsx
index fc8f8893..4542d0de 100644
--- a/src/app/organizations/[organizationSlug]/(manage)/settings/page.tsx
+++ b/src/app/organizations/[organizationSlug]/(manage)/settings/page.tsx
@@ -37,13 +37,12 @@ interface Props {
 const OrganizationSettingsPage = async ({ params }: Props) => {
   const { organizationSlug } = await params;
 
-  const session = await auth();
-
-  if (!session) notFound();
-
-  const organization = await getOrganization({ organizationSlug });
+  const [session, organization] = await Promise.all([
+    auth(),
+    getOrganization({ organizationSlug }),
+  ]);
 
-  if (!organization) notFound();
+  if (!session || !organization) notFound();
 
   const sdk = getSdk({ session });
 
@@ -58,23 +57,23 @@ const OrganizationSettingsPage = async ({ params }: Props) => {
 
   await Promise.all([
     queryClient.prefetchQuery({
-      queryKey: useOrganizationRoleQuery.getKey({
-        userId: session.user.rowId!,
+      queryKey: useMembersQuery.getKey({
         organizationId: organization.rowId,
+        roles: [Role.Owner],
       }),
-      queryFn: useOrganizationRoleQuery.fetcher({
-        userId: session.user.rowId!,
+      queryFn: useMembersQuery.fetcher({
         organizationId: organization.rowId,
+        roles: [Role.Owner],
       }),
     }),
     queryClient.prefetchQuery({
-      queryKey: useMembersQuery.getKey({
+      queryKey: useOrganizationRoleQuery.getKey({
+        userId: session.user.rowId!,
         organizationId: organization.rowId,
-        roles: [Role.Owner],
       }),
-      queryFn: useMembersQuery.fetcher({
+      queryFn: useOrganizationRoleQuery.fetcher({
+        userId: session.user.rowId!,
         organizationId: organization.rowId,
-        roles: [Role.Owner],
       }),
     }),
   ]);
diff --git a/src/app/organizations/[organizationSlug]/page.tsx b/src/app/organizations/[organizationSlug]/page.tsx
index c896ad5e..3788a356 100644
--- a/src/app/organizations/[organizationSlug]/page.tsx
+++ b/src/app/organizations/[organizationSlug]/page.tsx
@@ -26,6 +26,7 @@ import { getQueryClient } from "lib/util";
 import { DialogType } from "store";
 
 import type { BreadcrumbRecord } from "components/core";
+import type { Member } from "generated/graphql";
 
 export const generateMetadata = async ({ params }: Props) => {
   const { organizationSlug } = await params;
@@ -52,8 +53,6 @@ const OrganizationPage = async ({ params }: Props) => {
 
   const session = await auth();
 
-  if (!session) notFound();
-
   const [
     organization,
     { isOwnerSubscribed, hasBasicTierPrivileges, hasTeamTierPrivileges },
@@ -66,12 +65,17 @@ const OrganizationPage = async ({ params }: Props) => {
 
   const sdk = getSdk({ session });
 
-  const { memberByUserIdAndOrganizationId: member } =
-    await sdk.OrganizationRole({
-      userId: session.user.rowId!,
+  let member: Partial<Member> | null = null;
+
+  if (session) {
+    const { memberByUserIdAndOrganizationId } = await sdk.OrganizationRole({
+      userId: session?.user.rowId!,
       organizationId: organization.rowId,
     });
 
+    member = memberByUserIdAndOrganizationId ?? null;
+  }
+
   const hasAdminPrivileges =
     member?.role === Role.Admin || member?.role === Role.Owner;
 
@@ -109,16 +113,20 @@ const OrganizationPage = async ({ params }: Props) => {
         organizationId: organization.rowId,
       }),
     }),
-    queryClient.prefetchQuery({
-      queryKey: useOrganizationRoleQuery.getKey({
-        organizationId: organization.rowId,
-        userId: session.user.rowId!,
-      }),
-      queryFn: useOrganizationRoleQuery.fetcher({
-        organizationId: organization.rowId,
-        userId: session.user.rowId!,
-      }),
-    }),
+    ...(session
+      ? [
+          queryClient.prefetchQuery({
+            queryKey: useOrganizationRoleQuery.getKey({
+              organizationId: organization.rowId,
+              userId: session.user.rowId!,
+            }),
+            queryFn: useOrganizationRoleQuery.fetcher({
+              organizationId: organization.rowId,
+              userId: session.user.rowId!,
+            }),
+          }),
+        ]
+      : []),
   ]);
 
   return (
@@ -162,7 +170,7 @@ const OrganizationPage = async ({ params }: Props) => {
           <OrganizationMetrics organizationId={organization.rowId} />
 
           <OrganizationManagement
-            user={session.user}
+            user={session?.user}
             organizationId={organization.rowId}
             hasAdminPrivileges={hasAdminPrivileges}
           />
diff --git a/src/app/organizations/[organizationSlug]/projects/[projectSlug]/[feedbackId]/page.tsx b/src/app/organizations/[organizationSlug]/projects/[projectSlug]/[feedbackId]/page.tsx
index d0b85e53..ad35bfc0 100644
--- a/src/app/organizations/[organizationSlug]/projects/[projectSlug]/[feedbackId]/page.tsx
+++ b/src/app/organizations/[organizationSlug]/projects/[projectSlug]/[feedbackId]/page.tsx
@@ -5,17 +5,20 @@ import { auth } from "auth";
 import { Comments, FeedbackDetails } from "components/feedback";
 import { Page } from "components/layout";
 import {
+  Role,
   useCommentsQuery,
-  useFeedbackByIdQuery,
   useInfiniteCommentsQuery,
   useOrganizationRoleQuery,
+  useProjectStatusesQuery,
 } from "generated/graphql";
 import { getFeedback } from "lib/actions";
 import { app } from "lib/config";
-import { freeTierCommentsOptions } from "lib/options";
+import { getSdk } from "lib/graphql";
+import { feedbackByIdOptions, freeTierCommentsOptions } from "lib/options";
 import { getQueryClient } from "lib/util";
 
 import type { BreadcrumbRecord } from "components/core";
+import type { Member } from "generated/graphql";
 
 export const metadata = {
   title: app.feedbackPage.breadcrumb,
@@ -38,12 +41,25 @@ const FeedbackPage = async ({ params }: Props) => {
 
   const session = await auth();
 
-  if (!session) notFound();
-
   const feedback = await getFeedback({ feedbackId });
 
   if (!feedback) notFound();
 
+  let member: Partial<Member> | null = null;
+
+  if (session) {
+    const sdk = getSdk({ session });
+
+    const { memberByUserIdAndOrganizationId } = await sdk.OrganizationRole({
+      userId: session?.user?.rowId!,
+      organizationId: feedback.project?.organization?.rowId!,
+    });
+
+    member = memberByUserIdAndOrganizationId ?? null;
+  }
+
+  const isAdmin = member?.role === Role.Admin || member?.role === Role.Owner;
+
   const queryClient = getQueryClient();
 
   const breadcrumbs: BreadcrumbRecord[] = [
@@ -69,43 +85,52 @@ const FeedbackPage = async ({ params }: Props) => {
   ];
 
   await Promise.all([
-    queryClient.prefetchQuery({
-      queryKey: useFeedbackByIdQuery.getKey({
-        rowId: feedbackId,
-        userId: session.user.rowId,
-      }),
-      queryFn: useFeedbackByIdQuery.fetcher({
+    queryClient.prefetchQuery(
+      feedbackByIdOptions({
         rowId: feedbackId,
-        userId: session.user.rowId,
+        userId: session?.user.rowId,
       }),
-    }),
-    queryClient.prefetchQuery(
-      freeTierCommentsOptions({ projectSlug, organizationSlug, feedbackId }),
     ),
-    queryClient.prefetchQuery({
-      queryKey: useOrganizationRoleQuery.getKey({
-        userId: session.user.rowId!,
-        organizationId: feedback.project?.organization?.rowId!,
-      }),
-      queryFn: useOrganizationRoleQuery.fetcher({
-        userId: session.user.rowId!,
-        organizationId: feedback.project?.organization?.rowId!,
-      }),
-    }),
     queryClient.prefetchInfiniteQuery({
       queryKey: useInfiniteCommentsQuery.getKey({ feedbackId }),
       queryFn: useCommentsQuery.fetcher({ feedbackId }),
       initialPageParam: undefined,
     }),
+    queryClient.prefetchQuery(
+      freeTierCommentsOptions({ projectSlug, organizationSlug, feedbackId }),
+    ),
+    // ! NB: only prefetch the project statuses if the user is an admin
+    ...(isAdmin
+      ? [
+          queryClient.prefetchQuery({
+            queryKey: useProjectStatusesQuery.getKey({
+              projectId: feedback.project?.rowId!,
+            }),
+            queryFn: useProjectStatusesQuery.fetcher({
+              projectId: feedback.project?.rowId!,
+            }),
+          }),
+          queryClient.prefetchQuery({
+            queryKey: useOrganizationRoleQuery.getKey({
+              userId: session?.user.rowId!,
+              organizationId: feedback.project?.organization?.rowId!,
+            }),
+            queryFn: useOrganizationRoleQuery.fetcher({
+              userId: session?.user.rowId!,
+              organizationId: feedback.project?.organization?.rowId!,
+            }),
+          }),
+        ]
+      : []),
   ]);
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
       <Page breadcrumbs={breadcrumbs}>
-        <FeedbackDetails user={session.user} feedbackId={feedbackId} />
+        <FeedbackDetails user={session?.user} feedbackId={feedbackId} />
 
         <Comments
-          user={session.user}
+          user={session?.user}
           organizationId={feedback.project?.organization?.rowId!}
           feedbackId={feedbackId}
         />
diff --git a/src/app/organizations/[organizationSlug]/projects/[projectSlug]/page.tsx b/src/app/organizations/[organizationSlug]/projects/[projectSlug]/page.tsx
index 31cefad2..38767cf7 100644
--- a/src/app/organizations/[organizationSlug]/projects/[projectSlug]/page.tsx
+++ b/src/app/organizations/[organizationSlug]/projects/[projectSlug]/page.tsx
@@ -7,23 +7,24 @@ import { auth } from "auth";
 import { Page } from "components/layout";
 import { ProjectLinks, ProjectOverview } from "components/project";
 import {
-  PostOrderBy,
   Role,
-  useInfinitePostsQuery,
   useOrganizationRoleQuery,
-  usePostsQuery,
   useProjectMetricsQuery,
-  useProjectQuery,
   useProjectStatusesQuery,
   useStatusBreakdownQuery,
 } from "generated/graphql";
 import { getProject } from "lib/actions";
 import { app } from "lib/config";
 import { getSdk } from "lib/graphql";
-import { freeTierFeedbackOptions } from "lib/options";
+import {
+  freeTierFeedbackOptions,
+  infinitePostsOptions,
+  projectOptions,
+} from "lib/options";
 import { getQueryClient, getSearchParams } from "lib/util";
 
 import type { BreadcrumbRecord } from "components/core";
+import type { Member } from "generated/graphql";
 import type { SearchParams } from "nuqs/server";
 
 export const generateMetadata = async ({ params }: Props) => {
@@ -54,18 +55,22 @@ const ProjectPage = async ({ params, searchParams }: Props) => {
 
   const session = await auth();
 
-  if (!session) notFound();
-
   const project = await getProject({ organizationSlug, projectSlug });
 
   if (!project) notFound();
 
   const sdk = getSdk({ session });
 
-  const { memberByUserIdAndOrganizationId } = await sdk.OrganizationRole({
-    userId: session.user?.rowId!,
-    organizationId: project.organization?.rowId!,
-  });
+  let member: Partial<Member> | null = null;
+
+  if (session) {
+    const { memberByUserIdAndOrganizationId } = await sdk.OrganizationRole({
+      userId: session?.user.rowId!,
+      organizationId: project.organization?.rowId!,
+    });
+
+    member = memberByUserIdAndOrganizationId ?? null;
+  }
 
   const { excludedStatuses, orderBy, search } =
     await getSearchParams.parse(searchParams);
@@ -91,50 +96,39 @@ const ProjectPage = async ({ params, searchParams }: Props) => {
   ];
 
   await Promise.all([
-    queryClient.prefetchQuery({
-      queryKey: useProjectQuery.getKey({
-        projectSlug,
-        organizationSlug,
-      }),
-      queryFn: useProjectQuery.fetcher({
+    queryClient.prefetchQuery(
+      projectOptions({
         projectSlug,
         organizationSlug,
+        userId: session?.user.rowId,
       }),
-    }),
+    ),
     queryClient.prefetchQuery(
       freeTierFeedbackOptions({ organizationSlug, projectSlug }),
     ),
-    queryClient.prefetchInfiniteQuery({
-      queryKey: useInfinitePostsQuery.getKey({
-        projectId: project.rowId,
-        excludedStatuses,
-        orderBy: orderBy
-          ? [orderBy as PostOrderBy, PostOrderBy.CreatedAtDesc]
-          : undefined,
-        search,
-        userId: session.user.rowId,
-      }),
-      queryFn: usePostsQuery.fetcher({
+    queryClient.prefetchInfiniteQuery(
+      infinitePostsOptions({
         projectId: project.rowId,
+        userId: session?.user.rowId,
         excludedStatuses,
-        orderBy: orderBy
-          ? [orderBy as PostOrderBy, PostOrderBy.CreatedAtDesc]
-          : undefined,
+        orderBy,
         search,
-        userId: session.user.rowId,
       }),
-      initialPageParam: undefined,
-    }),
-    queryClient.prefetchQuery({
-      queryKey: useOrganizationRoleQuery.getKey({
-        userId: session.user.rowId!,
-        organizationId: project.organization?.rowId!,
-      }),
-      queryFn: useOrganizationRoleQuery.fetcher({
-        userId: session.user.rowId!,
-        organizationId: project.organization?.rowId!,
-      }),
-    }),
+    ),
+    ...(session
+      ? [
+          queryClient.prefetchQuery({
+            queryKey: useOrganizationRoleQuery.getKey({
+              userId: session.user.rowId!,
+              organizationId: project.organization?.rowId!,
+            }),
+            queryFn: useOrganizationRoleQuery.fetcher({
+              userId: session.user.rowId!,
+              organizationId: project.organization?.rowId!,
+            }),
+          }),
+        ]
+      : []),
     queryClient.prefetchQuery({
       queryKey: useProjectMetricsQuery.getKey({ projectId: project.rowId }),
       queryFn: useProjectMetricsQuery.fetcher({ projectId: project.rowId }),
@@ -149,9 +143,7 @@ const ProjectPage = async ({ params, searchParams }: Props) => {
     }),
   ]);
 
-  const hasAdminPrivileges =
-    memberByUserIdAndOrganizationId &&
-    memberByUserIdAndOrganizationId.role !== Role.Member;
+  const hasAdminPrivileges = member && member.role !== Role.Member;
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
@@ -184,7 +176,7 @@ const ProjectPage = async ({ params, searchParams }: Props) => {
           ],
         }}
       >
-        <ProjectOverview user={session.user} projectId={project.rowId} />
+        <ProjectOverview user={session?.user} projectId={project.rowId} />
       </Page>
     </HydrationBoundary>
   );
diff --git a/src/app/organizations/[organizationSlug]/projects/[projectSlug]/settings/page.tsx b/src/app/organizations/[organizationSlug]/projects/[projectSlug]/settings/page.tsx
index 003c80f1..ff133a49 100644
--- a/src/app/organizations/[organizationSlug]/projects/[projectSlug]/settings/page.tsx
+++ b/src/app/organizations/[organizationSlug]/projects/[projectSlug]/settings/page.tsx
@@ -4,14 +4,11 @@ import { notFound } from "next/navigation";
 import { auth } from "auth";
 import { Page } from "components/layout";
 import { ProjectSettings } from "components/project";
-import {
-  Role,
-  useProjectQuery,
-  useProjectStatusesQuery,
-} from "generated/graphql";
+import { Role, useProjectStatusesQuery } from "generated/graphql";
 import { getProject } from "lib/actions";
 import { app, isDevEnv } from "lib/config";
 import { getSdk } from "lib/graphql";
+import { projectOptions } from "lib/options";
 import { getQueryClient } from "lib/util";
 
 import type { BreadcrumbRecord } from "components/core";
@@ -86,10 +83,13 @@ const ProjectSettingsPage = async ({ params }: Props) => {
   ];
 
   await Promise.all([
-    queryClient.prefetchQuery({
-      queryKey: useProjectQuery.getKey({ projectSlug, organizationSlug }),
-      queryFn: useProjectQuery.fetcher({ projectSlug, organizationSlug }),
-    }),
+    queryClient.prefetchQuery(
+      projectOptions({
+        projectSlug,
+        organizationSlug,
+        userId: session?.user.rowId,
+      }),
+    ),
     // TODO: when ready to implement for production, remove the development environment check
     ...(isDevEnv
       ? [
diff --git a/src/app/organizations/[organizationSlug]/projects/page.tsx b/src/app/organizations/[organizationSlug]/projects/page.tsx
index 58ae18ad..b82c4a8c 100644
--- a/src/app/organizations/[organizationSlug]/projects/page.tsx
+++ b/src/app/organizations/[organizationSlug]/projects/page.tsx
@@ -14,7 +14,7 @@ import { getQueryClient, getSearchParams } from "lib/util";
 import { DialogType } from "store";
 
 import type { BreadcrumbRecord } from "components/core";
-import type { ProjectsQueryVariables } from "generated/graphql";
+import type { Member, ProjectsQueryVariables } from "generated/graphql";
 import type { SearchParams } from "nuqs/server";
 
 export const generateMetadata = async ({ params }: Props) => {
@@ -44,8 +44,6 @@ const ProjectsPage = async ({ params, searchParams }: Props) => {
 
   const session = await auth();
 
-  if (!session) notFound();
-
   const [
     organization,
     { isOwnerSubscribed, hasBasicTierPrivileges, hasTeamTierPrivileges },
@@ -58,12 +56,17 @@ const ProjectsPage = async ({ params, searchParams }: Props) => {
 
   const sdk = getSdk({ session });
 
-  const { memberByUserIdAndOrganizationId: member } =
-    await sdk.OrganizationRole({
-      userId: session.user.rowId!,
+  let member: Partial<Member> | null = null;
+
+  if (session) {
+    const { memberByUserIdAndOrganizationId } = await sdk.OrganizationRole({
+      userId: session?.user.rowId!,
       organizationId: organization.rowId,
     });
 
+    member = memberByUserIdAndOrganizationId ?? null;
+  }
+
   const hasAdminPrivileges =
     member?.role === Role.Admin || member?.role === Role.Owner;
 
@@ -101,12 +104,10 @@ const ProjectsPage = async ({ params, searchParams }: Props) => {
     search,
   };
 
-  await Promise.all([
-    queryClient.prefetchQuery({
-      queryKey: useProjectsQuery.getKey(variables),
-      queryFn: useProjectsQuery.fetcher(variables),
-    }),
-  ]);
+  await queryClient.prefetchQuery({
+    queryKey: useProjectsQuery.getKey(variables),
+    queryFn: useProjectsQuery.fetcher(variables),
+  });
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
@@ -131,7 +132,7 @@ const ProjectsPage = async ({ params, searchParams }: Props) => {
         <ProjectFilters />
 
         <ProjectList
-          user={session.user}
+          user={session?.user}
           canCreateProjects={canCreateProjects}
         />
 
diff --git a/src/app/organizations/page.tsx b/src/app/organizations/page.tsx
index c0af362e..c033c434 100644
--- a/src/app/organizations/page.tsx
+++ b/src/app/organizations/page.tsx
@@ -1,5 +1,4 @@
 import { HydrationBoundary, dehydrate } from "@tanstack/react-query";
-import { notFound } from "next/navigation";
 
 import { auth } from "auth";
 import { OrganizationsOverview } from "components/organization";
@@ -32,8 +31,6 @@ interface Props {
 const OrganizationsPage = async ({ searchParams }: Props) => {
   const session = await auth();
 
-  if (!session) notFound();
-
   const queryClient = getQueryClient();
 
   const { page, pageSize, search } = await getSearchParams.parse(searchParams);
@@ -51,27 +48,31 @@ const OrganizationsPage = async ({ searchParams }: Props) => {
       queryKey: useOrganizationsQuery.getKey(organizationsQueryVariables),
       queryFn: useOrganizationsQuery.fetcher(organizationsQueryVariables),
     }),
-    queryClient.prefetchQuery({
-      queryKey: useOrganizationsQuery.getKey({
-        pageSize: 1,
-        userId: organizationsQueryVariables.userId,
-        excludeRoles: [Role.Member, Role.Admin],
-      }),
-      queryFn: useOrganizationsQuery.fetcher({
-        pageSize: 1,
-        userId: organizationsQueryVariables.userId,
-        excludeRoles: [Role.Member, Role.Admin],
-      }),
-    }),
-    queryClient.prefetchQuery({
-      queryKey: useUserQuery.getKey({ hidraId: session.user.hidraId! }),
-      queryFn: useUserQuery.fetcher({ hidraId: session.user.hidraId! }),
-    }),
+    ...(session
+      ? [
+          queryClient.prefetchQuery({
+            queryKey: useOrganizationsQuery.getKey({
+              pageSize: 1,
+              userId: session?.user.rowId,
+              excludeRoles: [Role.Member, Role.Admin],
+            }),
+            queryFn: useOrganizationsQuery.fetcher({
+              pageSize: 1,
+              userId: session?.user.rowId,
+              excludeRoles: [Role.Member, Role.Admin],
+            }),
+          }),
+          queryClient.prefetchQuery({
+            queryKey: useUserQuery.getKey({ hidraId: session?.user.hidraId! }),
+            queryFn: useUserQuery.fetcher({ hidraId: session?.user.hidraId! }),
+          }),
+        ]
+      : []),
   ]);
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
-      <OrganizationsOverview user={session.user} />
+      <OrganizationsOverview user={session?.user} />
     </HydrationBoundary>
   );
 };
diff --git a/src/components/dashboard/FeedbackOverview/FeedbackOverview.tsx b/src/components/dashboard/FeedbackOverview/FeedbackOverview.tsx
index dfbd20c6..96b52d5a 100644
--- a/src/components/dashboard/FeedbackOverview/FeedbackOverview.tsx
+++ b/src/components/dashboard/FeedbackOverview/FeedbackOverview.tsx
@@ -76,7 +76,6 @@ const FeedbackOverview = ({ user, oneWeekAgo }: Props) => {
   return (
     <FeedbackSection
       title="Feedback Overview"
-      maxH="xl"
       contentProps={{
         align: "center",
         justify: "center",
diff --git a/src/components/dashboard/FeedbackSection/FeedbackSection.tsx b/src/components/dashboard/FeedbackSection/FeedbackSection.tsx
index daa9626b..76c2b596 100644
--- a/src/components/dashboard/FeedbackSection/FeedbackSection.tsx
+++ b/src/components/dashboard/FeedbackSection/FeedbackSection.tsx
@@ -17,12 +17,9 @@ interface Props extends FlexProps {
 const FeedbackSection = ({ title, children, contentProps, ...rest }: Props) => (
   <Stack
     position="relative"
-    flex={1}
-    h="100%"
     bgColor="background.default"
     borderRadius="lg"
     boxShadow="card"
-    overflow="auto"
     {...rest}
   >
     <Text
@@ -30,6 +27,7 @@ const FeedbackSection = ({ title, children, contentProps, ...rest }: Props) => (
       top={0}
       w="full"
       backgroundColor="background.subtle"
+      borderTopRadius="lg"
       fontSize="2xl"
       fontWeight="semibold"
       boxShadow="xs"
diff --git a/src/components/dashboard/RecentFeedback/RecentFeedback.tsx b/src/components/dashboard/RecentFeedback/RecentFeedback.tsx
index f2458000..3cb9aa56 100644
--- a/src/components/dashboard/RecentFeedback/RecentFeedback.tsx
+++ b/src/components/dashboard/RecentFeedback/RecentFeedback.tsx
@@ -55,10 +55,10 @@ const RecentFeedback = ({ user }: Props) => {
     <FeedbackSection
       ref={rootRef}
       title="Recent Feedback"
-      maxH="xl"
       contentProps={{
-        overflow: "auto",
-        scrollbar: "hidden",
+        position: "relative",
+        // NB: the margin is necessary to prevent the mask from clipping box shadows
+        mb: "1px",
       }}
     >
       {isError ? (
@@ -69,12 +69,19 @@ const RecentFeedback = ({ user }: Props) => {
           w="full"
         />
       ) : (
-        // NB: the margin is necessary to prevent clipping of the card borders/box shadows
-        <Stack w="full" gap={2} h="full" mb="1px">
+        <Stack
+          w="full"
+          // NB: necessary to prevent the mask from clipping box shadows. Must be centered within this parent container.
+          align="center"
+          maxH="lg"
+          overflow="auto"
+          scrollbar="hidden"
+          gap={2}
+        >
           {isLoading ? (
             <SkeletonArray count={5} h={24} w="100%" />
           ) : recentFeedback?.length ? (
-            <VStack gap={0} p={1}>
+            <VStack w="full" gap={0} p={1}>
               {recentFeedback?.map((feedback) => (
                 <Flex key={feedback?.rowId} direction="column" w="full" p={1}>
                   <Link
@@ -109,7 +116,10 @@ const RecentFeedback = ({ user }: Props) => {
             />
           )}
 
-          {!!recentFeedback?.length && <GradientMask bottom={0} />}
+          {!!recentFeedback?.length && (
+            // NB: the width override is necessary to prevent the mask from clipping box shadows
+            <GradientMask bottom={0} borderBottomRadius="lg" w="99%" />
+          )}
         </Stack>
       )}
     </FeedbackSection>
diff --git a/src/components/feedback/CommentCard/CommentCard.tsx b/src/components/feedback/CommentCard/CommentCard.tsx
index df231bee..186051e2 100644
--- a/src/components/feedback/CommentCard/CommentCard.tsx
+++ b/src/components/feedback/CommentCard/CommentCard.tsx
@@ -23,11 +23,11 @@ import { DestructiveAction } from "components/core";
 import { CreateReply, Replies } from "components/feedback";
 import {
   useDeleteCommentMutation,
-  useFeedbackByIdQuery,
   useInfiniteCommentsQuery,
 } from "generated/graphql";
 import { app } from "lib/config";
 import { useOrganizationMembership } from "lib/hooks";
+import { feedbackByIdOptions } from "lib/options";
 import { setSingularOrPlural } from "lib/util";
 
 import type { StackProps } from "@omnidev/sigil";
@@ -87,12 +87,12 @@ const CommentCard = ({
             }),
           }),
           queryClient.invalidateQueries({ queryKey: ["Posts.infinite"] }),
-          queryClient.invalidateQueries({
-            queryKey: useFeedbackByIdQuery.getKey({
+          queryClient.invalidateQueries(
+            feedbackByIdOptions({
               rowId: feedbackId,
               userId: user?.rowId,
             }),
-          }),
+          ),
         ]),
     });
 
diff --git a/src/components/feedback/Comments/Comments.tsx b/src/components/feedback/Comments/Comments.tsx
index fa0a1695..b280a769 100644
--- a/src/components/feedback/Comments/Comments.tsx
+++ b/src/components/feedback/Comments/Comments.tsx
@@ -26,7 +26,7 @@ import type { Session } from "next-auth";
 
 interface Props {
   /** Authenticated user. */
-  user: Session["user"];
+  user: Session["user"] | undefined;
   /** Organization ID. */
   organizationId: Organization["rowId"];
   /** Feedback ID. */
@@ -139,7 +139,7 @@ const Comments = ({ user, organizationId, feedbackId }: Props) => {
                     user={user}
                     comment={comment!}
                     organizationId={organizationId}
-                    canReply={canCreateComment ?? false}
+                    canReply={!!user && !!canCreateComment}
                     w="full"
                     minH={21}
                   />
diff --git a/src/components/feedback/CreateComment/CreateComment.tsx b/src/components/feedback/CreateComment/CreateComment.tsx
index bfef2372..853b7135 100644
--- a/src/components/feedback/CreateComment/CreateComment.tsx
+++ b/src/components/feedback/CreateComment/CreateComment.tsx
@@ -9,13 +9,12 @@ import { z } from "zod";
 import { CharacterLimit } from "components/core";
 import {
   useCreateCommentMutation,
-  useFeedbackByIdQuery,
   useInfiniteCommentsQuery,
 } from "generated/graphql";
 import { app } from "lib/config";
 import { DEBOUNCE_TIME, uuidSchema } from "lib/constants";
 import { useForm } from "lib/hooks";
-import { freeTierCommentsOptions } from "lib/options";
+import { feedbackByIdOptions, freeTierCommentsOptions } from "lib/options";
 import { toaster } from "lib/util";
 
 import type { Session } from "next-auth";
@@ -68,12 +67,12 @@ const CreateComment = ({ user, canCreateComment }: Props) => {
             feedbackId,
           }),
         ),
-        queryClient.invalidateQueries({
-          queryKey: useFeedbackByIdQuery.getKey({
+        queryClient.invalidateQueries(
+          feedbackByIdOptions({
             rowId: feedbackId,
             userId: user?.rowId,
           }),
-        }),
+        ),
       ]);
 
       return queryClient.invalidateQueries({
@@ -145,7 +144,11 @@ const CreateComment = ({ user, canCreateComment }: Props) => {
             fontSize="sm"
             minH={16}
             disabled={!user || !canCreateComment}
-            tooltip={app.feedbackPage.comments.disabled}
+            tooltip={
+              user
+                ? app.feedbackPage.comments.disabled.signedIn
+                : app.feedbackPage.comments.disabled.signedOut
+            }
             maxLength={MAX_COMMENT_LENGTH}
             errorProps={{
               top: -6,
diff --git a/src/components/feedback/CreateFeedback/CreateFeedback.tsx b/src/components/feedback/CreateFeedback/CreateFeedback.tsx
index e4c347e5..89a77fc9 100644
--- a/src/components/feedback/CreateFeedback/CreateFeedback.tsx
+++ b/src/components/feedback/CreateFeedback/CreateFeedback.tsx
@@ -10,15 +10,14 @@ import { CharacterLimit } from "components/core";
 import {
   useCreateFeedbackMutation,
   useProjectMetricsQuery,
-  useProjectQuery,
   useProjectStatusesQuery,
   useStatusBreakdownQuery,
 } from "generated/graphql";
 import { app } from "lib/config";
 import { DEBOUNCE_TIME, uuidSchema } from "lib/constants";
 import { useForm } from "lib/hooks";
+import { freeTierFeedbackOptions, projectOptions } from "lib/options";
 import { useDialogStore } from "lib/hooks/store";
-import { freeTierFeedbackOptions } from "lib/options";
 import { toaster } from "lib/util";
 import { DialogType } from "store";
 
@@ -72,16 +71,15 @@ const CreateFeedback = ({ user }: Props) => {
     freeTierFeedbackOptions({ organizationSlug, projectSlug }),
   );
 
-  const { data: projectId } = useProjectQuery(
-    {
+  const { data: projectId } = useQuery({
+    ...projectOptions({
       projectSlug,
       organizationSlug,
-    },
-    {
-      enabled: !!projectSlug && !!organizationSlug,
-      select: (data) => data?.projects?.nodes?.[0]?.rowId,
-    },
-  );
+      userId: user?.rowId,
+    }),
+    enabled: !!projectSlug && !!organizationSlug,
+    select: (data) => data?.projects?.nodes?.[0]?.rowId,
+  });
 
   const { data: defaultStatusId } = useProjectStatusesQuery(
     {
diff --git a/src/components/feedback/CreateReply/CreateReply.tsx b/src/components/feedback/CreateReply/CreateReply.tsx
index e22ea010..75741598 100644
--- a/src/components/feedback/CreateReply/CreateReply.tsx
+++ b/src/components/feedback/CreateReply/CreateReply.tsx
@@ -9,7 +9,6 @@ import { z } from "zod";
 import { CharacterLimit } from "components/core";
 import {
   useCreateCommentMutation,
-  useFeedbackByIdQuery,
   useInfiniteCommentsQuery,
   useInfiniteRepliesQuery,
 } from "generated/graphql";
@@ -17,7 +16,7 @@ import { token } from "generated/panda/tokens";
 import { app } from "lib/config";
 import { DEBOUNCE_TIME, uuidSchema } from "lib/constants";
 import { useAuth, useForm } from "lib/hooks";
-import { freeTierCommentsOptions } from "lib/options";
+import { feedbackByIdOptions, freeTierCommentsOptions } from "lib/options";
 import { toaster } from "lib/util";
 
 import type { CollapsibleProps } from "@omnidev/sigil";
@@ -75,12 +74,12 @@ const CreateReply = ({ commentId, canReply, onReply, ...rest }: Props) => {
             feedbackId,
           }),
         }),
-        queryClient.invalidateQueries({
-          queryKey: useFeedbackByIdQuery.getKey({
+        queryClient.invalidateQueries(
+          feedbackByIdOptions({
             rowId: feedbackId,
             userId: user?.rowId,
           }),
-        }),
+        ),
         queryClient.invalidateQueries(
           freeTierCommentsOptions({
             organizationSlug,
diff --git a/src/components/feedback/FeedbackCard/FeedbackCard.tsx b/src/components/feedback/FeedbackCard/FeedbackCard.tsx
index 29131677..52ac8a79 100644
--- a/src/components/feedback/FeedbackCard/FeedbackCard.tsx
+++ b/src/components/feedback/FeedbackCard/FeedbackCard.tsx
@@ -21,13 +21,10 @@ import { DestructiveAction, StatusBadge } from "components/core";
 import { UpdateFeedback, VotingButtons } from "components/feedback";
 import {
   useDeletePostMutation,
-  useFeedbackByIdQuery,
-  useInfinitePostsQuery,
   useProjectMetricsQuery,
   useStatusBreakdownQuery,
   useUpdatePostMutation,
 } from "generated/graphql";
-import { app } from "lib/config";
 import { useSearchParams } from "lib/hooks";
 import { useStatusMenuStore } from "lib/hooks/store";
 
@@ -36,10 +33,12 @@ import type { InfiniteData } from "@tanstack/react-query";
 import type {
   FeedbackByIdQuery,
   FeedbackFragment,
-  PostOrderBy,
   PostStatus,
   PostsQuery,
 } from "generated/graphql";
+import { app } from "lib/config";
+import { feedbackByIdOptions, infinitePostsOptions } from "lib/options";
+
 import type { Session } from "next-auth";
 
 interface ProjectStatus {
@@ -130,76 +129,78 @@ const FeedbackCard = ({
   const { mutate: updateStatus, isPending: isUpdateStatusPending } =
     useUpdatePostMutation({
       onMutate: (variables) => {
+        const feedbackKey = feedbackByIdOptions({
+          rowId: feedback.rowId!,
+          userId: user?.rowId,
+        }).queryKey;
+
         const feedbackSnapshot = queryClient.getQueryData(
-          useFeedbackByIdQuery.getKey({
-            rowId: feedback.rowId!,
-            userId: user?.rowId,
-          }),
+          feedbackKey,
         ) as FeedbackByIdQuery;
 
-        const postsQueryKey = useInfinitePostsQuery.getKey({
+        const postsQueryKey = infinitePostsOptions({
           projectId: feedback.project?.rowId!,
+          userId: user?.rowId,
           excludedStatuses,
-          orderBy: orderBy ? (orderBy as PostOrderBy) : undefined,
+          orderBy,
           search,
-          userId: user?.rowId,
-        });
+        }).queryKey;
 
-        const postsSnapshot = queryClient.getQueryData(
-          postsQueryKey,
-        ) as InfiniteData<PostsQuery>;
+        const postsSnapshot =
+          queryClient.getQueryData<InfiniteData<PostsQuery>>(postsQueryKey);
 
         const updatedStatus = projectStatuses?.find(
           (status) => status.rowId === variables.patch.statusId,
         );
 
         if (feedbackSnapshot) {
-          queryClient.setQueryData(
-            useFeedbackByIdQuery.getKey({
-              rowId: feedback.rowId!,
-              userId: user?.rowId,
-            }),
-            {
-              post: {
-                ...feedbackSnapshot.post,
-                statusId: variables.patch.statusId,
-                statusUpdatedAt: variables.patch.statusUpdatedAt,
-                status: {
-                  ...feedbackSnapshot.post?.status,
-                  status: updatedStatus?.status,
-                  color: updatedStatus?.color,
-                },
+          queryClient.setQueryData(feedbackKey, {
+            post: {
+              ...feedbackSnapshot.post,
+              statusId: variables.patch.statusId,
+              statusUpdatedAt: variables.patch.statusUpdatedAt,
+              status: {
+                ...feedbackSnapshot.post?.status,
+                status: updatedStatus?.status,
+                color: updatedStatus?.color,
               },
             },
-          );
+          } as FeedbackByIdQuery);
         }
 
         if (postsSnapshot) {
-          queryClient.setQueryData(postsQueryKey, {
-            ...postsSnapshot,
-            pages: postsSnapshot.pages.map((page) => ({
-              ...page,
-              posts: {
-                ...page.posts,
-                nodes: page.posts?.nodes?.map((post) => {
-                  if (post?.rowId === variables.rowId) {
-                    return {
-                      ...post,
-                      statusUpdatedAt: variables.patch.statusUpdatedAt,
-                      status: {
-                        ...post?.status,
-                        rowId: variables.patch.statusId,
-                        status: updatedStatus?.status,
-                        color: updatedStatus?.color,
-                      },
-                    };
-                  }
-
-                  return post;
-                }),
-              },
-            })),
-          });
+          queryClient.setQueryData<InfiniteData<PostsQuery>>(
+            postsQueryKey,
+            (snapshot) => {
+              const updatedPosts = snapshot?.pages.map((page) => ({
+                ...page,
+                posts: {
+                  ...page.posts,
+                  nodes: page.posts?.nodes?.map((post) => {
+                    if (post?.rowId === variables.rowId) {
+                      return {
+                        ...post,
+                        statusUpdatedAt: variables.patch.statusUpdatedAt,
+                        status: {
+                          ...post?.status,
+                          rowId: variables.patch.statusId,
+                          status: updatedStatus?.status,
+                          color: updatedStatus?.color,
+                        },
+                      };
+                    }
+
+                    return post;
+                  }),
+                },
+              }));
+
+              return {
+                ...snapshot,
+                pages: updatedPosts,
+              } as InfiniteData<PostsQuery>;
+            },
+          );
         }
       },
       onSettled: async () =>
@@ -212,12 +213,12 @@ const FeedbackCard = ({
             }),
           }),
 
-          queryClient.invalidateQueries({
-            queryKey: useFeedbackByIdQuery.getKey({
+          queryClient.invalidateQueries(
+            feedbackByIdOptions({
               rowId: feedback.rowId!,
               userId: user?.rowId,
             }),
-          }),
+          ),
         ]),
     });
 
@@ -281,6 +282,7 @@ const FeedbackCard = ({
           </Stack>
 
           <VotingButtons
+            user={user}
             feedbackId={feedback.rowId!}
             projectId={feedback?.project?.rowId!}
             upvote={userUpvote}
diff --git a/src/components/feedback/FeedbackDetails/FeedbackDetails.tsx b/src/components/feedback/FeedbackDetails/FeedbackDetails.tsx
index 5842fbf3..f1f51a23 100644
--- a/src/components/feedback/FeedbackDetails/FeedbackDetails.tsx
+++ b/src/components/feedback/FeedbackDetails/FeedbackDetails.tsx
@@ -1,11 +1,10 @@
 "use client";
+import { useQuery } from "@tanstack/react-query";
 
 import { FeedbackCard } from "components/feedback";
-import {
-  useFeedbackByIdQuery,
-  useProjectStatusesQuery,
-} from "generated/graphql";
+import { useProjectStatusesQuery } from "generated/graphql";
 import { useOrganizationMembership } from "lib/hooks";
+import { feedbackByIdOptions } from "lib/options";
 
 import type { HstackProps } from "@omnidev/sigil";
 import type { Post } from "generated/graphql";
@@ -13,7 +12,7 @@ import type { Session } from "next-auth";
 
 interface Props extends HstackProps {
   /** Authenticated user. */
-  user: Session["user"];
+  user: Session["user"] | undefined;
   /** Feedback ID. Used to fetch feedback details. */
   feedbackId: Post["rowId"];
 }
@@ -22,14 +21,8 @@ interface Props extends HstackProps {
  * Feedback details section.
  */
 const FeedbackDetails = ({ user, feedbackId, ...rest }: Props) => {
-  const { data: feedback } = useFeedbackByIdQuery(
-    {
-      rowId: feedbackId,
-      userId: user?.rowId,
-    },
-    {
-      select: (data) => data?.post,
-    },
+  const { data: feedback } = useQuery(
+    feedbackByIdOptions({ rowId: feedbackId, userId: user?.rowId }),
   );
 
   const { isAdmin } = useOrganizationMembership({
diff --git a/src/components/feedback/UpdateFeedback/UpdateFeedback.tsx b/src/components/feedback/UpdateFeedback/UpdateFeedback.tsx
index b5599991..23bd98e5 100644
--- a/src/components/feedback/UpdateFeedback/UpdateFeedback.tsx
+++ b/src/components/feedback/UpdateFeedback/UpdateFeedback.tsx
@@ -15,12 +15,13 @@ import { useIsClient } from "usehooks-ts";
 import { z } from "zod";
 
 import { CharacterLimit } from "components/core";
-import { useFeedbackByIdQuery, useUpdatePostMutation } from "generated/graphql";
+import { useUpdatePostMutation } from "generated/graphql";
 import { token } from "generated/panda/tokens";
 import { app } from "lib/config";
 import { DEBOUNCE_TIME } from "lib/constants";
 import { useForm, useViewportSize } from "lib/hooks";
 import { toaster } from "lib/util";
+import { feedbackByIdOptions } from "lib/options";
 
 import type { DialogProps } from "@omnidev/sigil";
 import type { FeedbackFragment } from "generated/graphql";
@@ -78,12 +79,12 @@ const UpdateFeedback = ({ user, feedback, ...rest }: Props) => {
         queryClient.invalidateQueries({
           queryKey: ["Posts.infinite"],
         }),
-        queryClient.invalidateQueries({
-          queryKey: useFeedbackByIdQuery.getKey({
+        queryClient.invalidateQueries(
+          feedbackByIdOptions({
             rowId: feedback.rowId!,
             userId: user?.rowId,
           }),
-        }),
+        ),
       ]);
     },
     onSuccess: () => {
diff --git a/src/components/feedback/VotingButtons/VotingButtons.tsx b/src/components/feedback/VotingButtons/VotingButtons.tsx
index aee4937b..5f7ebc6d 100644
--- a/src/components/feedback/VotingButtons/VotingButtons.tsx
+++ b/src/components/feedback/VotingButtons/VotingButtons.tsx
@@ -14,8 +14,11 @@ import {
 } from "lib/hooks/mutations";
 
 import type { Downvote, Post, Project, Upvote } from "generated/graphql";
+import type { Session } from "next-auth";
 
 interface Props {
+  /** Authenticated user. */
+  user: Session["user"] | undefined;
   /** Feedback ID. */
   feedbackId: Post["rowId"];
   /** Project ID. */
@@ -33,6 +36,7 @@ interface Props {
 }
 
 const VotingButtons = ({
+  user,
   feedbackId,
   projectId,
   upvote,
@@ -101,16 +105,20 @@ const VotingButtons = ({
             e.stopPropagation();
             handleUpvote();
           },
-          disabled: isVotePending || isOptimistic,
+          disabled: !user || isVotePending || isOptimistic,
+          opacity: !user ? 0.5 : 1,
         }}
       >
-        {app.feedbackPage.details.upvote}
+        {!user
+          ? app.feedbackPage.details.signedOut
+          : app.feedbackPage.details.upvote}
       </Tooltip>
 
       <Text
         color={netVotesColor}
         whiteSpace="nowrap"
         fontVariant="tabular-nums"
+        opacity={!user ? 0.5 : 1}
       >
         {`${netTotalVotes > 0 ? "+" : ""}${netTotalVotes}`}
       </Text>
@@ -132,10 +140,13 @@ const VotingButtons = ({
             e.stopPropagation();
             handleDownvote();
           },
-          disabled: isVotePending || isOptimistic,
+          disabled: !user || isVotePending || isOptimistic,
+          opacity: !user ? 0.5 : 1,
         }}
       >
-        {app.feedbackPage.details.downvote}
+        {!user
+          ? app.feedbackPage.details.signedOut
+          : app.feedbackPage.details.downvote}
       </Tooltip>
     </HStack>
   );
diff --git a/src/components/layout/Header/Header.tsx b/src/components/layout/Header/Header.tsx
index 7aae8f64..01cd42a3 100644
--- a/src/components/layout/Header/Header.tsx
+++ b/src/components/layout/Header/Header.tsx
@@ -28,6 +28,8 @@ const Header = () => {
   const showPricingLink =
     !isLoading && (!isAuthenticated || subscriptionNotFound);
 
+  const showOrganizationsLink = !isLoading && !isAuthenticated;
+
   return (
     <sigil.header
       display="flex"
@@ -46,7 +48,7 @@ const Header = () => {
 
           <HStack gap={1}>
             {showPricingLink && (
-              <Flex display={{ base: "none", sm: "flex" }}>
+              <Flex display={{ base: "none", md: "flex" }}>
                 <Link href="/pricing" role="group">
                   <Flex
                     h={10}
@@ -69,9 +71,33 @@ const Header = () => {
               </Flex>
             )}
 
+            {showOrganizationsLink && (
+              <Flex display={{ base: "none", md: "flex" }}>
+                <Link href="/organizations" role="group">
+                  <Flex
+                    h={10}
+                    px={4}
+                    align="center"
+                    color={{
+                      base: "foreground.muted",
+                      _groupHover: "foreground.default",
+                    }}
+                    bgColor={
+                      pathname === "/organizations"
+                        ? "background.muted"
+                        : "transparent"
+                    }
+                    borderRadius="md"
+                  >
+                    {app.header.routes.organizations.label}
+                  </Flex>
+                </Link>
+              </Flex>
+            )}
+
             <SigilLink
               href={app.docsUrl}
-              display={{ base: "none", sm: "flex" }}
+              display={{ base: "none", md: "flex" }}
               color="foreground.muted"
               _hover={{ color: "foreground.default" }}
               isExternal
diff --git a/src/components/layout/HeaderActions/HeaderActions.tsx b/src/components/layout/HeaderActions/HeaderActions.tsx
index 3ade4d96..08ec2f4d 100644
--- a/src/components/layout/HeaderActions/HeaderActions.tsx
+++ b/src/components/layout/HeaderActions/HeaderActions.tsx
@@ -31,8 +31,8 @@ import { DialogType } from "store";
  * Header actions.
  */
 const HeaderActions = () => {
-  const isSmallViewport = useViewportSize({
-    minWidth: token("breakpoints.sm"),
+  const isMediumViewport = useViewportSize({
+    minWidth: token("breakpoints.md"),
   });
 
   const { isAuthenticated, isLoading } = useAuth(),
@@ -46,14 +46,14 @@ const HeaderActions = () => {
   };
 
   useEffect(() => {
-    if (isSmallViewport) {
+    if (isMediumViewport) {
       setIsMobileSidebarOpen(false);
     }
-  }, [isSmallViewport, setIsMobileSidebarOpen]);
+  }, [isMediumViewport, setIsMobileSidebarOpen]);
 
   if (isLoading) return null;
 
-  if (isSmallViewport) {
+  if (isMediumViewport) {
     return (
       <Flex alignItems="center" gap={1}>
         <ThemeToggle />
diff --git a/src/components/layout/SidebarNavigation/SidebarNavigation.tsx b/src/components/layout/SidebarNavigation/SidebarNavigation.tsx
index c81ca034..88626534 100644
--- a/src/components/layout/SidebarNavigation/SidebarNavigation.tsx
+++ b/src/components/layout/SidebarNavigation/SidebarNavigation.tsx
@@ -55,7 +55,7 @@ const SidebarNavigation = () => {
               <Button
                 justifyContent="space-between"
                 variant="ghost"
-                backgroundColor="background.subtle"
+                backgroundColor="background.muted/70"
                 w="full"
                 color={isActive ? "brand.primary" : "inherit"}
               >
@@ -106,7 +106,7 @@ const SidebarNavigation = () => {
                             <Button
                               justifyContent="space-between"
                               variant="ghost"
-                              backgroundColor="background.subtle"
+                              backgroundColor="background.muted/70"
                               w="full"
                               color={isActive ? "brand.primary" : "inherit"}
                             >
@@ -147,7 +147,6 @@ const SidebarNavigation = () => {
                                       }
                                     >
                                       <Button
-                                        disabled={isActive}
                                         variant="ghost"
                                         tabIndex={-1}
                                         w="full"
@@ -172,7 +171,6 @@ const SidebarNavigation = () => {
                               onClick={() => setIsMobileSidebarOpen(false)}
                             >
                               <Button
-                                disabled={isActive}
                                 variant="ghost"
                                 tabIndex={-1}
                                 justifyContent="left"
diff --git a/src/components/organization/OrganizationManagement/OrganizationManagement.tsx b/src/components/organization/OrganizationManagement/OrganizationManagement.tsx
index 6415e6a9..c9076dd1 100644
--- a/src/components/organization/OrganizationManagement/OrganizationManagement.tsx
+++ b/src/components/organization/OrganizationManagement/OrganizationManagement.tsx
@@ -7,6 +7,7 @@ import { HiOutlineFolder, HiOutlineUserGroup } from "react-icons/hi2";
 import { LuSettings } from "react-icons/lu";
 
 import { SectionContainer } from "components/layout";
+import { useOrganizationQuery } from "generated/graphql";
 import { app } from "lib/config";
 import { useOrganizationMembership } from "lib/hooks";
 
@@ -20,6 +21,8 @@ interface Action extends ButtonProps {
   label: string;
   /** Visual icon. */
   icon: IconType;
+  /** Alias for disabled. Used to render action but still apply disabled state. */
+  isDisabled?: boolean;
 }
 
 interface Props {
@@ -49,6 +52,15 @@ const OrganizationManagement = ({
     organizationId,
   });
 
+  const { data: organization } = useOrganizationQuery(
+    {
+      slug: organizationSlug,
+    },
+    {
+      select: (data) => data.organizationBySlug,
+    },
+  );
+
   const ORGANIZATION_ACTIONS: Action[] = [
     {
       label: managementDetails.cta.manageTeam.label,
@@ -73,6 +85,7 @@ const OrganizationManagement = ({
       icon: HiOutlineFolder,
       onClick: () => router.push(`/organizations/${organizationSlug}/projects`),
       disabled: isMember,
+      isDisabled: !organization?.projects.totalCount,
     },
   ];
 
@@ -89,8 +102,13 @@ const OrganizationManagement = ({
     >
       <Grid gap={4}>
         {ORGANIZATION_ACTIONS.filter(({ disabled }) => !disabled).map(
-          ({ label, icon, ...rest }) => (
-            <Button key={label} variant="outline" {...rest}>
+          ({ label, icon, disabled, isDisabled, ...rest }) => (
+            <Button
+              key={label}
+              variant="outline"
+              disabled={disabled || isDisabled}
+              {...rest}
+            >
               <Icon src={icon} w={4} h={4} />
 
               {label}
diff --git a/src/components/organization/OrganizationsOverview/OrganizationsOverview.tsx b/src/components/organization/OrganizationsOverview/OrganizationsOverview.tsx
index 79c899bc..ce8f7570 100644
--- a/src/components/organization/OrganizationsOverview/OrganizationsOverview.tsx
+++ b/src/components/organization/OrganizationsOverview/OrganizationsOverview.tsx
@@ -26,7 +26,7 @@ const breadcrumbs: BreadcrumbRecord[] = [
 
 interface Props {
   /** Authenticated user. */
-  user: Session["user"];
+  user: Session["user"] | undefined;
 }
 
 /**
@@ -36,7 +36,7 @@ const OrganizationsOverview = ({ user }: Props) => {
   const { data: organizations } = useOrganizationsQuery(
     {
       pageSize: 1,
-      userId: user.rowId,
+      userId: user?.rowId,
       excludeRoles: [Role.Member, Role.Admin],
     },
     {
@@ -46,10 +46,10 @@ const OrganizationsOverview = ({ user }: Props) => {
 
   const { data: tierRestrictions } = useUserQuery(
     {
-      hidraId: user.hidraId!,
+      hidraId: user?.hidraId!,
     },
     {
-      enabled: !!organizations,
+      enabled: !!organizations && !!user?.hidraId,
       select: (data) => {
         const userTier = data?.userByHidraId?.tier;
 
diff --git a/src/components/project/ProjectFeedback/ProjectFeedback.tsx b/src/components/project/ProjectFeedback/ProjectFeedback.tsx
index 479deb6a..17a998f0 100644
--- a/src/components/project/ProjectFeedback/ProjectFeedback.tsx
+++ b/src/components/project/ProjectFeedback/ProjectFeedback.tsx
@@ -12,7 +12,11 @@ import {
   Stack,
   Text,
 } from "@omnidev/sigil";
-import { keepPreviousData, useMutationState } from "@tanstack/react-query";
+import {
+  keepPreviousData,
+  useInfiniteQuery,
+  useMutationState,
+} from "@tanstack/react-query";
 import { useParams, useRouter } from "next/navigation";
 import { HiOutlineFolder } from "react-icons/hi2";
 import { LuPlus } from "react-icons/lu";
@@ -25,7 +29,6 @@ import { SwitchFeedbackView } from "components/project";
 import {
   PostOrderBy,
   useCreateFeedbackMutation,
-  useInfinitePostsQuery,
   useProjectStatusesQuery,
 } from "generated/graphql";
 import { app } from "lib/config";
@@ -34,6 +37,7 @@ import {
   useOrganizationMembership,
   useSearchParams,
 } from "lib/hooks";
+import { infinitePostsOptions } from "lib/options";
 import {
   ViewState,
   useDialogStore,
@@ -106,27 +110,18 @@ const ProjectFeedback = ({ user, projectId }: Props) => {
     isError,
     hasNextPage,
     fetchNextPage,
-  } = useInfinitePostsQuery(
-    {
+  } = useInfiniteQuery({
+    ...infinitePostsOptions({
       projectId,
+      userId: user?.rowId,
       excludedStatuses,
-      orderBy: orderBy
-        ? [orderBy as PostOrderBy, PostOrderBy.CreatedAtDesc]
-        : undefined,
+      orderBy,
       search,
-      userId: user?.rowId,
-    },
-    {
-      placeholderData: keepPreviousData,
-      initialPageParam: undefined,
-      getNextPageParam: (lastPage) =>
-        lastPage?.posts?.pageInfo?.hasNextPage
-          ? { after: lastPage?.posts?.pageInfo?.endCursor }
-          : undefined,
-      select: (data) =>
-        data?.pages?.flatMap((page) => page?.posts?.nodes?.map((post) => post)),
-    },
-  );
+    }),
+    placeholderData: keepPreviousData,
+    select: (data) =>
+      data?.pages?.flatMap((page) => page?.posts?.nodes?.map((post) => post)),
+  });
 
   const pendingFeedback = useMutationState<FeedbackFragment>({
     filters: {
diff --git a/src/components/project/ProjectOverview/ProjectOverview.tsx b/src/components/project/ProjectOverview/ProjectOverview.tsx
index ed984649..25b1db1d 100644
--- a/src/components/project/ProjectOverview/ProjectOverview.tsx
+++ b/src/components/project/ProjectOverview/ProjectOverview.tsx
@@ -16,7 +16,7 @@ import type { Session } from "next-auth";
 
 interface Props {
   /** Authenticated user. */
-  user: Session["user"];
+  user: Session["user"] | undefined;
   /** Project ID. */
   projectId: Project["rowId"];
 }
diff --git a/src/components/project/ProjectSettings/ProjectSettings.tsx b/src/components/project/ProjectSettings/ProjectSettings.tsx
index d17c809b..4cf869fb 100644
--- a/src/components/project/ProjectSettings/ProjectSettings.tsx
+++ b/src/components/project/ProjectSettings/ProjectSettings.tsx
@@ -69,7 +69,7 @@ const ProjectSettings = ({ user, projectId, organizationSlug }: Props) => {
 
   return (
     <Stack gap={6}>
-      <UpdateProject />
+      <UpdateProject user={user} />
 
       <SectionContainer
         title={app.projectSettingsPage.dangerZone.title}
diff --git a/src/components/project/UpdateProject/UpdateProject.tsx b/src/components/project/UpdateProject/UpdateProject.tsx
index 9e370a40..0067257a 100644
--- a/src/components/project/UpdateProject/UpdateProject.tsx
+++ b/src/components/project/UpdateProject/UpdateProject.tsx
@@ -16,7 +16,6 @@ import { UpdateSocials, UpdateStatuses } from "components/project";
 import {
   useCreateProjectSocialMutation,
   useDeleteProjectSocialMutation,
-  useProjectQuery,
   useUpdateProjectMutation,
 } from "generated/graphql";
 import { app, isDevEnv } from "lib/config";
@@ -98,10 +97,15 @@ const updateProjectSchema = z
     },
   );
 
+interface Props {
+  /** Authenticated user. */
+  user: Session["user"];
+}
+
 /**
  * Form for updating project details.
  */
-const UpdateProject = () => {
+const UpdateProject = ({ user }: Props) => {
   const queryClient = useQueryClient();
 
   const isUpdatingProject = useIsMutating({ mutationKey: ["Project"] });
@@ -113,16 +117,15 @@ const UpdateProject = () => {
 
   const router = useRouter();
 
-  const { data: project } = useProjectQuery(
-    {
+  const { data: project } = useQuery({
+    ...projectOptions({
       projectSlug,
       organizationSlug,
-    },
-    {
-      placeholderData: keepPreviousData,
-      select: (data) => data.projects?.nodes?.[0],
-    },
-  );
+      userId: user?.rowId,
+    }),
+    placeholderData: keepPreviousData,
+    select: (data) => data.projects?.nodes?.[0],
+  });
 
   const { mutateAsync: createProjectSocial } = useCreateProjectSocialMutation({
     mutationKey: ["Project", "CreateProjectSocial"],
diff --git a/src/generated/graphql.mock.ts b/src/generated/graphql.mock.ts
index 88b6fb3a..4c503f45 100644
--- a/src/generated/graphql.mock.ts
+++ b/src/generated/graphql.mock.ts
@@ -575,28 +575,6 @@ export const mockDeleteUpvoteMutation = (resolver: GraphQLResponseResolver<Types
     options
   )
 
-/**
- * @param resolver A function that accepts [resolver arguments](https://mswjs.io/docs/api/graphql#resolver-argument) and must always return the instruction on what to do with the intercepted request. ([see more](https://mswjs.io/docs/concepts/response-resolver#resolver-instructions))
- * @param options Options object to customize the behavior of the mock. ([see more](https://mswjs.io/docs/api/graphql#handler-options))
- * @see https://mswjs.io/docs/basics/response-resolver
- * @example
- * mockCreateUserMutation(
- *   ({ query, variables }) => {
- *     const { hidraId, username, firstName, lastName, email } = variables;
- *     return HttpResponse.json({
- *       data: { createUser }
- *     })
- *   },
- *   requestOptions
- * )
- */
-export const mockCreateUserMutation = (resolver: GraphQLResponseResolver<Types.CreateUserMutation, Types.CreateUserMutationVariables>, options?: RequestHandlerOptions) =>
-  graphql.mutation<Types.CreateUserMutation, Types.CreateUserMutationVariables>(
-    'CreateUser',
-    resolver,
-    options
-  )
-
 /**
  * @param resolver A function that accepts [resolver arguments](https://mswjs.io/docs/api/graphql#resolver-argument) and must always return the instruction on what to do with the intercepted request. ([see more](https://mswjs.io/docs/concepts/response-resolver#resolver-instructions))
  * @param options Options object to customize the behavior of the mock. ([see more](https://mswjs.io/docs/api/graphql#handler-options))
diff --git a/src/generated/graphql.sdk.ts b/src/generated/graphql.sdk.ts
index 4d1dc934..06189dd6 100644
--- a/src/generated/graphql.sdk.ts
+++ b/src/generated/graphql.sdk.ts
@@ -710,39 +710,6 @@ export type CreateUpvotePayloadUpvoteEdgeArgs = {
   orderBy?: Array<UpvoteOrderBy>;
 };
 
-/** All input for the create `User` mutation. */
-export type CreateUserInput = {
-  /**
-   * An arbitrary string value with no semantic meaning. Will be included in the
-   * payload verbatim. May be used to track mutations by the client.
-   */
-  clientMutationId?: InputMaybe<Scalars['String']['input']>;
-  /** The `User` to be created by this mutation. */
-  user: UserInput;
-};
-
-/** The output of our create `User` mutation. */
-export type CreateUserPayload = {
-  __typename?: 'CreateUserPayload';
-  /**
-   * The exact same `clientMutationId` that was provided in the mutation input,
-   * unchanged and unused. May be used by a client to track mutations.
-   */
-  clientMutationId?: Maybe<Scalars['String']['output']>;
-  /** Our root query field type. Allows us to run any query from our mutation payload. */
-  query?: Maybe<Query>;
-  /** The `User` that was created by this mutation. */
-  user?: Maybe<User>;
-  /** An edge for our `User`. May be used by Relay 1. */
-  userEdge?: Maybe<UserEdge>;
-};
-
-
-/** The output of our create `User` mutation. */
-export type CreateUserPayloadUserEdgeArgs = {
-  orderBy?: Array<UserOrderBy>;
-};
-
 /** A filter to be used against Datetime fields. All fields are combined with a logical ‘and.’ */
 export type DatetimeFilter = {
   /** Not equal to the specified value, treating null like an ordinary value. */
@@ -1828,8 +1795,6 @@ export type Mutation = {
   createProjectSocial?: Maybe<CreateProjectSocialPayload>;
   /** Creates a single `Upvote`. */
   createUpvote?: Maybe<CreateUpvotePayload>;
-  /** Creates a single `User`. */
-  createUser?: Maybe<CreateUserPayload>;
   /** Deletes a single `Comment` using a unique key. */
   deleteComment?: Maybe<DeleteCommentPayload>;
   /** Deletes a single `Downvote` using a unique key. */
@@ -1937,12 +1902,6 @@ export type MutationCreateUpvoteArgs = {
 };
 
 
-/** The root mutation type which contains root level fields which mutate data. */
-export type MutationCreateUserArgs = {
-  input: CreateUserInput;
-};
-
-
 /** The root mutation type which contains root level fields which mutate data. */
 export type MutationDeleteCommentArgs = {
   input: DeleteCommentInput;
@@ -5253,18 +5212,6 @@ export type UserHavingVarianceSampleInput = {
   updatedAt?: InputMaybe<HavingDatetimeFilter>;
 };
 
-/** An input for mutations affecting `User` */
-export type UserInput = {
-  createdAt?: InputMaybe<Scalars['Datetime']['input']>;
-  email: Scalars['String']['input'];
-  firstName?: InputMaybe<Scalars['String']['input']>;
-  hidraId: Scalars['UUID']['input'];
-  lastName?: InputMaybe<Scalars['String']['input']>;
-  rowId?: InputMaybe<Scalars['UUID']['input']>;
-  updatedAt?: InputMaybe<Scalars['Datetime']['input']>;
-  username?: InputMaybe<Scalars['String']['input']>;
-};
-
 /** Methods to use when ordering `User`. */
 export enum UserOrderBy {
   CommentsCountAsc = 'COMMENTS_COUNT_ASC',
@@ -5635,17 +5582,6 @@ export type DeleteUpvoteMutationVariables = Exact<{
 
 export type DeleteUpvoteMutation = { __typename?: 'Mutation', deleteUpvote?: { __typename?: 'DeleteUpvotePayload', clientMutationId?: string | null } | null };
 
-export type CreateUserMutationVariables = Exact<{
-  hidraId: Scalars['UUID']['input'];
-  username?: InputMaybe<Scalars['String']['input']>;
-  firstName?: InputMaybe<Scalars['String']['input']>;
-  lastName?: InputMaybe<Scalars['String']['input']>;
-  email: Scalars['String']['input'];
-}>;
-
-
-export type CreateUserMutation = { __typename?: 'Mutation', createUser?: { __typename?: 'CreateUserPayload', user?: { __typename?: 'User', rowId: string } | null } | null };
-
 export type CommentsQueryVariables = Exact<{
   feedbackId: Scalars['UUID']['input'];
   pageSize?: InputMaybe<Scalars['Int']['input']>;
@@ -6195,17 +6131,6 @@ export const DeleteUpvoteDocument = gql`
   }
 }
     `;
-export const CreateUserDocument = gql`
-    mutation CreateUser($hidraId: UUID!, $username: String, $firstName: String, $lastName: String, $email: String!) {
-  createUser(
-    input: {user: {hidraId: $hidraId, username: $username, firstName: $firstName, lastName: $lastName, email: $email}}
-  ) {
-    user {
-      rowId
-    }
-  }
-}
-    `;
 export const CommentsDocument = gql`
     query Comments($feedbackId: UUID!, $pageSize: Int = 10, $after: Cursor) {
   comments(
@@ -6673,9 +6598,6 @@ export function getSdk(client: GraphQLClient, withWrapper: SdkFunctionWrapper =
     DeleteUpvote(variables: DeleteUpvoteMutationVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<DeleteUpvoteMutation> {
       return withWrapper((wrappedRequestHeaders) => client.request<DeleteUpvoteMutation>(DeleteUpvoteDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'DeleteUpvote', 'mutation', variables);
     },
-    CreateUser(variables: CreateUserMutationVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<CreateUserMutation> {
-      return withWrapper((wrappedRequestHeaders) => client.request<CreateUserMutation>(CreateUserDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'CreateUser', 'mutation', variables);
-    },
     Comments(variables: CommentsQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<CommentsQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<CommentsQuery>(CommentsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'Comments', 'query', variables);
     },
diff --git a/src/generated/graphql.ts b/src/generated/graphql.ts
index ba4a1c4d..4f6e0379 100644
--- a/src/generated/graphql.ts
+++ b/src/generated/graphql.ts
@@ -709,39 +709,6 @@ export type CreateUpvotePayloadUpvoteEdgeArgs = {
   orderBy?: Array<UpvoteOrderBy>;
 };
 
-/** All input for the create `User` mutation. */
-export type CreateUserInput = {
-  /**
-   * An arbitrary string value with no semantic meaning. Will be included in the
-   * payload verbatim. May be used to track mutations by the client.
-   */
-  clientMutationId?: InputMaybe<Scalars['String']['input']>;
-  /** The `User` to be created by this mutation. */
-  user: UserInput;
-};
-
-/** The output of our create `User` mutation. */
-export type CreateUserPayload = {
-  __typename?: 'CreateUserPayload';
-  /**
-   * The exact same `clientMutationId` that was provided in the mutation input,
-   * unchanged and unused. May be used by a client to track mutations.
-   */
-  clientMutationId?: Maybe<Scalars['String']['output']>;
-  /** Our root query field type. Allows us to run any query from our mutation payload. */
-  query?: Maybe<Query>;
-  /** The `User` that was created by this mutation. */
-  user?: Maybe<User>;
-  /** An edge for our `User`. May be used by Relay 1. */
-  userEdge?: Maybe<UserEdge>;
-};
-
-
-/** The output of our create `User` mutation. */
-export type CreateUserPayloadUserEdgeArgs = {
-  orderBy?: Array<UserOrderBy>;
-};
-
 /** A filter to be used against Datetime fields. All fields are combined with a logical ‘and.’ */
 export type DatetimeFilter = {
   /** Not equal to the specified value, treating null like an ordinary value. */
@@ -1827,8 +1794,6 @@ export type Mutation = {
   createProjectSocial?: Maybe<CreateProjectSocialPayload>;
   /** Creates a single `Upvote`. */
   createUpvote?: Maybe<CreateUpvotePayload>;
-  /** Creates a single `User`. */
-  createUser?: Maybe<CreateUserPayload>;
   /** Deletes a single `Comment` using a unique key. */
   deleteComment?: Maybe<DeleteCommentPayload>;
   /** Deletes a single `Downvote` using a unique key. */
@@ -1936,12 +1901,6 @@ export type MutationCreateUpvoteArgs = {
 };
 
 
-/** The root mutation type which contains root level fields which mutate data. */
-export type MutationCreateUserArgs = {
-  input: CreateUserInput;
-};
-
-
 /** The root mutation type which contains root level fields which mutate data. */
 export type MutationDeleteCommentArgs = {
   input: DeleteCommentInput;
@@ -5252,18 +5211,6 @@ export type UserHavingVarianceSampleInput = {
   updatedAt?: InputMaybe<HavingDatetimeFilter>;
 };
 
-/** An input for mutations affecting `User` */
-export type UserInput = {
-  createdAt?: InputMaybe<Scalars['Datetime']['input']>;
-  email: Scalars['String']['input'];
-  firstName?: InputMaybe<Scalars['String']['input']>;
-  hidraId: Scalars['UUID']['input'];
-  lastName?: InputMaybe<Scalars['String']['input']>;
-  rowId?: InputMaybe<Scalars['UUID']['input']>;
-  updatedAt?: InputMaybe<Scalars['Datetime']['input']>;
-  username?: InputMaybe<Scalars['String']['input']>;
-};
-
 /** Methods to use when ordering `User`. */
 export enum UserOrderBy {
   CommentsCountAsc = 'COMMENTS_COUNT_ASC',
@@ -5634,17 +5581,6 @@ export type DeleteUpvoteMutationVariables = Exact<{
 
 export type DeleteUpvoteMutation = { __typename?: 'Mutation', deleteUpvote?: { __typename?: 'DeleteUpvotePayload', clientMutationId?: string | null } | null };
 
-export type CreateUserMutationVariables = Exact<{
-  hidraId: Scalars['UUID']['input'];
-  username?: InputMaybe<Scalars['String']['input']>;
-  firstName?: InputMaybe<Scalars['String']['input']>;
-  lastName?: InputMaybe<Scalars['String']['input']>;
-  email: Scalars['String']['input'];
-}>;
-
-
-export type CreateUserMutation = { __typename?: 'Mutation', createUser?: { __typename?: 'CreateUserPayload', user?: { __typename?: 'User', rowId: string } | null } | null };
-
 export type CommentsQueryVariables = Exact<{
   feedbackId: Scalars['UUID']['input'];
   pageSize?: InputMaybe<Scalars['Int']['input']>;
@@ -6689,36 +6625,6 @@ useDeleteUpvoteMutation.getKey = () => ['DeleteUpvote'];
 
 useDeleteUpvoteMutation.fetcher = (variables: DeleteUpvoteMutationVariables, options?: RequestInit['headers']) => graphqlFetch<DeleteUpvoteMutation, DeleteUpvoteMutationVariables>(DeleteUpvoteDocument, variables, options);
 
-export const CreateUserDocument = `
-    mutation CreateUser($hidraId: UUID!, $username: String, $firstName: String, $lastName: String, $email: String!) {
-  createUser(
-    input: {user: {hidraId: $hidraId, username: $username, firstName: $firstName, lastName: $lastName, email: $email}}
-  ) {
-    user {
-      rowId
-    }
-  }
-}
-    `;
-
-export const useCreateUserMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<CreateUserMutation, TError, CreateUserMutationVariables, TContext>) => {
-    
-    return useMutation<CreateUserMutation, TError, CreateUserMutationVariables, TContext>(
-      {
-    mutationKey: ['CreateUser'],
-    mutationFn: (variables?: CreateUserMutationVariables) => graphqlFetch<CreateUserMutation, CreateUserMutationVariables>(CreateUserDocument, variables)(),
-    ...options
-  }
-    )};
-
-useCreateUserMutation.getKey = () => ['CreateUser'];
-
-
-useCreateUserMutation.fetcher = (variables: CreateUserMutationVariables, options?: RequestInit['headers']) => graphqlFetch<CreateUserMutation, CreateUserMutationVariables>(CreateUserDocument, variables, options);
-
 export const CommentsDocument = `
     query Comments($feedbackId: UUID!, $pageSize: Int = 10, $after: Cursor) {
   comments(
diff --git a/src/lib/actions/getCustomer.ts b/src/lib/actions/getCustomer.ts
index a9acd80a..b8889f76 100644
--- a/src/lib/actions/getCustomer.ts
+++ b/src/lib/actions/getCustomer.ts
@@ -6,15 +6,15 @@ import { polar } from "lib/polar";
 /**
  * Server action to get customer details.
  */
-const getCustomer = async (userId: string) => {
+const getCustomer = async () => {
   const session = await auth();
 
   if (!session) {
-    throw new Error("Unauthorized");
+    throw new Error("No customer found");
   }
 
   return await polar.customers.getStateExternal({
-    externalId: userId,
+    externalId: session.user?.hidraId!,
   });
 };
 
diff --git a/src/lib/actions/getFeedback.ts b/src/lib/actions/getFeedback.ts
index a113789c..904e7724 100644
--- a/src/lib/actions/getFeedback.ts
+++ b/src/lib/actions/getFeedback.ts
@@ -16,8 +16,6 @@ interface OrganizationOptions {
 const getFeedback = cache(async ({ feedbackId }: OrganizationOptions) => {
   const session = await getAuthSession();
 
-  if (!session) return null;
-
   const sdk = getSdk({ session });
 
   const { post: feedback } = await sdk.FeedbackById({ rowId: feedbackId });
diff --git a/src/lib/actions/getOrganization.ts b/src/lib/actions/getOrganization.ts
index 07a75ba5..fdbf48cb 100644
--- a/src/lib/actions/getOrganization.ts
+++ b/src/lib/actions/getOrganization.ts
@@ -17,8 +17,6 @@ const getOrganization = cache(
   async ({ organizationSlug }: OrganizationOptions) => {
     const session = await getAuthSession();
 
-    if (!session) return null;
-
     const sdk = getSdk({ session });
 
     const { organizationBySlug: organization } = await sdk.Organization({
diff --git a/src/lib/actions/getProject.ts b/src/lib/actions/getProject.ts
index a318a30c..d260df28 100644
--- a/src/lib/actions/getProject.ts
+++ b/src/lib/actions/getProject.ts
@@ -19,14 +19,12 @@ const getProject = cache(
   async ({ organizationSlug, projectSlug }: ProjectOptions) => {
     const session = await getAuthSession();
 
-    if (!session) return null;
-
     const sdk = getSdk({ session });
 
     const { projects } = await sdk.Project({
       projectSlug,
       organizationSlug,
-      userId: session.user.rowId!,
+      userId: session?.user.rowId,
     });
 
     return projects?.nodes?.[0];
diff --git a/src/lib/actions/getSubscription.ts b/src/lib/actions/getSubscription.ts
index 725b17c1..9bf13b54 100644
--- a/src/lib/actions/getSubscription.ts
+++ b/src/lib/actions/getSubscription.ts
@@ -5,8 +5,8 @@ import { getCustomer, getProduct } from "lib/actions";
 /**
  * Server action to get subscription details.
  */
-const getSubscription = async (userId: string) => {
-  const customer = await getCustomer(userId);
+const getSubscription = async () => {
+  const customer = await getCustomer();
 
   if (!customer.activeSubscriptions.length) {
     throw new Error("No active subscriptions found");
diff --git a/src/lib/config/app.config.ts b/src/lib/config/app.config.ts
index 10f598f1..8c64dac3 100644
--- a/src/lib/config/app.config.ts
+++ b/src/lib/config/app.config.ts
@@ -90,6 +90,9 @@ const app = {
       pricing: {
         label: "Pricing",
       },
+      organizations: {
+        label: "Organizations",
+      },
       docs: {
         label: "Docs",
       },
@@ -906,7 +909,10 @@ const app = {
     projectFeedback: {
       title: "Project Feedback",
       endOf: "End of Feedback",
-      disabled: "Maximum amount of feedback reached.",
+      disabled: {
+        signedIn: "Maximum amount of feedback reached.",
+        signedOut: "Please sign in to submit feedback.",
+      },
       search: {
         placeholder: "Search feedback...",
       },
@@ -1020,12 +1026,16 @@ const app = {
   feedbackPage: {
     breadcrumb: "Feedback",
     details: {
+      signedOut: "Sign in to vote",
       upvote: "Upvote",
       downvote: "Downvote",
     },
     comments: {
       endOf: "End of Comments",
-      disabled: "Maximum number of comments reached.",
+      disabled: {
+        signedIn: "Maximum number of comments reached.",
+        signedOut: "Please sign in to comment.",
+      },
       createComment: {
         pending: "Adding comment...",
         success: {
diff --git a/src/lib/graphql/getSdk.ts b/src/lib/graphql/getSdk.ts
index fdeb4937..6d8d2f5d 100644
--- a/src/lib/graphql/getSdk.ts
+++ b/src/lib/graphql/getSdk.ts
@@ -7,7 +7,7 @@ import type { Session } from "next-auth";
 
 interface Options {
   /** Auth session required to retrieve the appropriate `accessToken`.  */
-  session: Session;
+  session: Session | null;
 }
 
 /**
@@ -16,7 +16,7 @@ interface Options {
 const getSdk = ({ session }: Options) => {
   const graphqlClient = new GraphQLClient(API_GRAPHQL_URL!, {
     headers: {
-      Authorization: `Bearer ${session.accessToken}`,
+      Authorization: `Bearer ${session?.accessToken ?? ""}`,
     },
   });
 
diff --git a/src/lib/graphql/mutations/user/createUser.mutation.graphql b/src/lib/graphql/mutations/user/createUser.mutation.graphql
deleted file mode 100644
index 313d6942..00000000
--- a/src/lib/graphql/mutations/user/createUser.mutation.graphql
+++ /dev/null
@@ -1,23 +0,0 @@
-mutation CreateUser(
-  $hidraId: UUID!
-  $username: String
-  $firstName: String
-  $lastName: String
-  $email: String!
-) {
-  createUser(
-    input: {
-      user: {
-        hidraId: $hidraId
-        username: $username
-        firstName: $firstName
-        lastName: $lastName
-        email: $email
-      }
-    }
-  ) {
-    user {
-      rowId
-    }
-  }
-}
diff --git a/src/lib/hooks/mutations/useHandleDownvoteMutation.tsx b/src/lib/hooks/mutations/useHandleDownvoteMutation.tsx
index c5bfcb75..f0c62aa5 100644
--- a/src/lib/hooks/mutations/useHandleDownvoteMutation.tsx
+++ b/src/lib/hooks/mutations/useHandleDownvoteMutation.tsx
@@ -1,15 +1,13 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 
 import {
-  PostOrderBy,
   useCreateDownvoteMutation,
   useDeleteDownvoteMutation,
   useDeleteUpvoteMutation,
-  useFeedbackByIdQuery,
-  useInfinitePostsQuery,
   useProjectMetricsQuery,
 } from "generated/graphql";
 import { useAuth, useSearchParams } from "lib/hooks";
+import { feedbackByIdOptions, infinitePostsOptions } from "lib/options";
 
 import type { InfiniteData, UseMutationOptions } from "@tanstack/react-query";
 import type {
@@ -82,88 +80,91 @@ const useHandleDownvoteMutation = ({
       }
     },
     onMutate: async () => {
+      const feedbackQueryKey = feedbackByIdOptions({
+        rowId: feedbackId,
+        userId: user?.rowId,
+      }).queryKey;
+
       const feedbackSnapshot = queryClient.getQueryData(
-        useFeedbackByIdQuery.getKey({ rowId: feedbackId, userId: user?.rowId }),
+        feedbackQueryKey,
       ) as FeedbackByIdQuery;
 
-      const postsQueryKey = useInfinitePostsQuery.getKey({
+      const postsQueryKey = infinitePostsOptions({
         projectId,
+        userId: user?.rowId,
         excludedStatuses,
-        orderBy: orderBy
-          ? [orderBy as PostOrderBy, PostOrderBy.CreatedAtDesc]
-          : undefined,
+        orderBy,
         search,
-        userId: user?.rowId,
-      });
+      }).queryKey;
 
-      const postsSnapshot = queryClient.getQueryData(
-        postsQueryKey,
-      ) as InfiniteData<PostsQuery>;
+      const postsSnapshot =
+        queryClient.getQueryData<InfiniteData<PostsQuery>>(postsQueryKey);
 
       if (feedbackSnapshot) {
-        queryClient.setQueryData(
-          useFeedbackByIdQuery.getKey({
-            rowId: feedbackId,
-            userId: user?.rowId,
-          }),
-          {
-            post: {
-              ...feedbackSnapshot?.post,
-              userDownvotes: {
-                nodes: downvote ? [] : [{ rowId: "pending" }],
-              },
-              userUpvotes: {
-                nodes: downvote ? feedbackSnapshot?.post?.userUpvotes : [],
-              },
-              downvotes: {
-                ...feedbackSnapshot?.post?.downvotes,
-                totalCount:
-                  (feedbackSnapshot?.post?.downvotes?.totalCount ?? 0) +
-                  (downvote ? -1 : 1),
-              },
-              upvotes: {
-                ...feedbackSnapshot?.post?.upvotes,
-                totalCount:
-                  (feedbackSnapshot?.post?.upvotes?.totalCount ?? 0) +
-                  (upvote ? -1 : 0),
-              },
+        queryClient.setQueryData(feedbackQueryKey, {
+          post: {
+            ...feedbackSnapshot?.post,
+            userDownvotes: {
+              nodes: downvote ? [] : [{ rowId: "pending" }],
+            },
+            userUpvotes: {
+              nodes: downvote ? feedbackSnapshot?.post?.userUpvotes : [],
+            },
+            downvotes: {
+              ...feedbackSnapshot?.post?.downvotes,
+              totalCount:
+                (feedbackSnapshot?.post?.downvotes?.totalCount ?? 0) +
+                (downvote ? -1 : 1),
+            },
+            upvotes: {
+              ...feedbackSnapshot?.post?.upvotes,
+              totalCount:
+                (feedbackSnapshot?.post?.upvotes?.totalCount ?? 0) +
+                (upvote ? -1 : 0),
             },
           },
-        );
+        } as FeedbackByIdQuery);
       }
 
       if (postsSnapshot) {
-        queryClient.setQueryData(postsQueryKey, {
-          ...postsSnapshot,
-          pages: postsSnapshot.pages.map((page) => ({
-            ...page,
-            posts: {
-              ...page.posts,
-              nodes: page.posts?.nodes?.map((post) => {
-                if (post?.rowId === feedbackId) {
-                  return {
-                    ...post,
-                    userDownvotes: {
-                      nodes: downvote ? [] : [{ rowId: "pending" }],
-                    },
-                    userUpvotes: {
-                      nodes: downvote ? post.userUpvotes : [],
-                    },
-                    upvotes: {
-                      totalCount: post.upvotes.totalCount + (upvote ? -1 : 0),
-                    },
-                    downvotes: {
-                      totalCount:
-                        post.downvotes.totalCount + (downvote ? -1 : 1),
-                    },
-                  };
-                }
-
-                return post;
-              }),
-            },
-          })),
-        });
+        queryClient.setQueryData<InfiniteData<PostsQuery>>(
+          postsQueryKey,
+          (snapshot) => {
+            const updatedPosts = snapshot!.pages.map((page) => ({
+              ...page,
+              posts: {
+                ...page.posts,
+                nodes: page.posts?.nodes?.map((post) => {
+                  if (post?.rowId === feedbackId) {
+                    return {
+                      ...post,
+                      userDownvotes: {
+                        nodes: downvote ? [] : [{ rowId: "pending" }],
+                      },
+                      userUpvotes: {
+                        nodes: downvote ? post.userUpvotes : [],
+                      },
+                      upvotes: {
+                        totalCount: post.upvotes.totalCount + (upvote ? -1 : 0),
+                      },
+                      downvotes: {
+                        totalCount:
+                          post.downvotes.totalCount + (downvote ? -1 : 1),
+                      },
+                    };
+                  }
+
+                  return post;
+                }),
+              },
+            }));
+
+            return {
+              ...snapshot,
+              pages: updatedPosts,
+            } as InfiniteData<PostsQuery>;
+          },
+        );
       }
     },
     onSettled: async () => {
@@ -175,21 +176,15 @@ const useHandleDownvoteMutation = ({
           }),
         ]);
 
-        return queryClient.invalidateQueries({
-          queryKey: useFeedbackByIdQuery.getKey({
-            rowId: feedbackId,
-            userId: user?.rowId,
-          }),
-        });
+        return queryClient.invalidateQueries(
+          feedbackByIdOptions({ rowId: feedbackId, userId: user?.rowId }),
+        );
       }
 
       await Promise.all([
-        queryClient.invalidateQueries({
-          queryKey: useFeedbackByIdQuery.getKey({
-            rowId: feedbackId,
-            userId: user?.rowId,
-          }),
-        }),
+        queryClient.invalidateQueries(
+          feedbackByIdOptions({ rowId: feedbackId, userId: user?.rowId }),
+        ),
         queryClient.invalidateQueries({
           queryKey: useProjectMetricsQuery.getKey({ projectId }),
         }),
diff --git a/src/lib/hooks/mutations/useHandleUpvoteMutation.tsx b/src/lib/hooks/mutations/useHandleUpvoteMutation.tsx
index 6cee687e..0c81b4e3 100644
--- a/src/lib/hooks/mutations/useHandleUpvoteMutation.tsx
+++ b/src/lib/hooks/mutations/useHandleUpvoteMutation.tsx
@@ -1,15 +1,13 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 
 import {
-  PostOrderBy,
   useCreateUpvoteMutation,
   useDeleteDownvoteMutation,
   useDeleteUpvoteMutation,
-  useFeedbackByIdQuery,
-  useInfinitePostsQuery,
   useProjectMetricsQuery,
 } from "generated/graphql";
 import { useAuth, useSearchParams } from "lib/hooks";
+import { feedbackByIdOptions, infinitePostsOptions } from "lib/options";
 
 import type { InfiniteData, UseMutationOptions } from "@tanstack/react-query";
 import type {
@@ -82,88 +80,91 @@ const useHandleUpvoteMutation = ({
       }
     },
     onMutate: async () => {
+      const feedbackQueryKey = feedbackByIdOptions({
+        rowId: feedbackId,
+        userId: user?.rowId,
+      }).queryKey;
+
       const feedbackSnapshot = queryClient.getQueryData(
-        useFeedbackByIdQuery.getKey({ rowId: feedbackId, userId: user?.rowId }),
+        feedbackQueryKey,
       ) as FeedbackByIdQuery;
 
-      const postsQueryKey = useInfinitePostsQuery.getKey({
+      const postsQueryKey = infinitePostsOptions({
         projectId,
+        userId: user?.rowId,
         excludedStatuses,
-        orderBy: orderBy
-          ? [orderBy as PostOrderBy, PostOrderBy.CreatedAtDesc]
-          : undefined,
+        orderBy,
         search,
-        userId: user?.rowId,
-      });
+      }).queryKey;
 
-      const postsSnapshot = queryClient.getQueryData(
-        postsQueryKey,
-      ) as InfiniteData<PostsQuery>;
+      const postsSnapshot =
+        queryClient.getQueryData<InfiniteData<PostsQuery>>(postsQueryKey);
 
       if (feedbackSnapshot) {
-        queryClient.setQueryData(
-          useFeedbackByIdQuery.getKey({
-            rowId: feedbackId,
-            userId: user?.rowId,
-          }),
-          {
-            post: {
-              ...feedbackSnapshot?.post,
-              userUpvotes: {
-                nodes: upvote ? [] : [{ rowId: "pending" }],
-              },
-              userDownvotes: {
-                nodes: upvote ? feedbackSnapshot?.post?.userDownvotes : [],
-              },
-              upvotes: {
-                ...feedbackSnapshot?.post?.upvotes,
-                totalCount:
-                  (feedbackSnapshot?.post?.upvotes?.totalCount ?? 0) +
-                  (upvote ? -1 : 1),
-              },
-              downvotes: {
-                ...feedbackSnapshot?.post?.downvotes,
-                totalCount:
-                  (feedbackSnapshot?.post?.downvotes?.totalCount ?? 0) +
-                  (downvote ? -1 : 0),
-              },
+        queryClient.setQueryData(feedbackQueryKey, {
+          post: {
+            ...feedbackSnapshot?.post,
+            userUpvotes: {
+              nodes: upvote ? [] : [{ rowId: "pending" }],
+            },
+            userDownvotes: {
+              nodes: upvote ? feedbackSnapshot?.post?.userDownvotes : [],
+            },
+            upvotes: {
+              ...feedbackSnapshot?.post?.upvotes,
+              totalCount:
+                (feedbackSnapshot?.post?.upvotes?.totalCount ?? 0) +
+                (upvote ? -1 : 1),
+            },
+            downvotes: {
+              ...feedbackSnapshot?.post?.downvotes,
+              totalCount:
+                (feedbackSnapshot?.post?.downvotes?.totalCount ?? 0) +
+                (downvote ? -1 : 0),
             },
           },
-        );
+        } as FeedbackByIdQuery);
       }
 
       if (postsSnapshot) {
-        queryClient.setQueryData(postsQueryKey, {
-          ...postsSnapshot,
-          pages: postsSnapshot.pages.map((page) => ({
-            ...page,
-            posts: {
-              ...page.posts,
-              nodes: page.posts?.nodes?.map((post) => {
-                if (post?.rowId === feedbackId) {
-                  return {
-                    ...post,
-                    userUpvotes: {
-                      nodes: upvote ? [] : [{ rowId: "pending" }],
-                    },
-                    userDownvotes: {
-                      nodes: upvote ? post.userDownvotes : [],
-                    },
-                    upvotes: {
-                      totalCount: post.upvotes.totalCount + (upvote ? -1 : 1),
-                    },
-                    downvotes: {
-                      totalCount:
-                        post.downvotes.totalCount + (downvote ? -1 : 0),
-                    },
-                  };
-                }
-
-                return post;
-              }),
-            },
-          })),
-        });
+        queryClient.setQueryData<InfiniteData<PostsQuery>>(
+          postsQueryKey,
+          (snapshot) => {
+            const updatedPosts = snapshot?.pages.map((page) => ({
+              ...page,
+              posts: {
+                ...page.posts,
+                nodes: page.posts?.nodes?.map((post) => {
+                  if (post?.rowId === feedbackId) {
+                    return {
+                      ...post,
+                      userUpvotes: {
+                        nodes: upvote ? [] : [{ rowId: "pending" }],
+                      },
+                      userDownvotes: {
+                        nodes: upvote ? post.userDownvotes : [],
+                      },
+                      upvotes: {
+                        totalCount: post.upvotes.totalCount + (upvote ? -1 : 1),
+                      },
+                      downvotes: {
+                        totalCount:
+                          post.downvotes.totalCount + (downvote ? -1 : 0),
+                      },
+                    };
+                  }
+
+                  return post;
+                }),
+              },
+            }));
+
+            return {
+              ...snapshot,
+              pages: updatedPosts,
+            } as InfiniteData<PostsQuery>;
+          },
+        );
       }
     },
     onSettled: async () => {
@@ -175,21 +176,15 @@ const useHandleUpvoteMutation = ({
           }),
         ]);
 
-        return queryClient.invalidateQueries({
-          queryKey: useFeedbackByIdQuery.getKey({
-            rowId: feedbackId,
-            userId: user?.rowId,
-          }),
-        });
+        return queryClient.invalidateQueries(
+          feedbackByIdOptions({ rowId: feedbackId, userId: user?.rowId }),
+        );
       }
 
       await Promise.all([
-        queryClient.invalidateQueries({
-          queryKey: useFeedbackByIdQuery.getKey({
-            rowId: feedbackId,
-            userId: user?.rowId,
-          }),
-        }),
+        queryClient.invalidateQueries(
+          feedbackByIdOptions({ rowId: feedbackId, userId: user?.rowId }),
+        ),
         queryClient.invalidateQueries({
           queryKey: useProjectMetricsQuery.getKey({ projectId }),
         }),
diff --git a/src/lib/hooks/useSidebarNavigationItems.tsx b/src/lib/hooks/useSidebarNavigationItems.tsx
index 1d80a99f..ec9202fa 100644
--- a/src/lib/hooks/useSidebarNavigationItems.tsx
+++ b/src/lib/hooks/useSidebarNavigationItems.tsx
@@ -52,7 +52,7 @@ const useSidebarNavigationItems = () => {
         slug: organizationSlug,
       },
       {
-        enabled: isAuthenticated && !!organizationSlug,
+        enabled: !!organizationSlug,
         select: (data) => data?.organizationBySlug,
       },
     ),
@@ -62,7 +62,7 @@ const useSidebarNavigationItems = () => {
         organizationId: organization?.rowId ?? "",
       },
       {
-        enabled: isAuthenticated && !!projectSlug && !!organization,
+        enabled: !!projectSlug && !!organization,
         select: (data) => data?.projectBySlugAndOrganizationId,
       },
     );
@@ -79,7 +79,7 @@ const useSidebarNavigationItems = () => {
         label: app.organizationsPage.breadcrumb,
         icon: LuBuilding2,
         isCollapsible: true,
-        isVisible: isAuthenticated,
+        isVisible: true,
         children: [
           {
             href: "/organizations",
@@ -97,7 +97,7 @@ const useSidebarNavigationItems = () => {
             label: app.projectsPage.breadcrumb,
             icon: HiOutlineFolder,
             isCollapsible: true,
-            isVisible: isAuthenticated && !!organizationSlug,
+            isVisible: !!organizationSlug,
             children: [
               {
                 href: `/organizations/${organizationSlug}/projects`,
diff --git a/src/lib/options/feedbackById.options.ts b/src/lib/options/feedbackById.options.ts
new file mode 100644
index 00000000..a033c82d
--- /dev/null
+++ b/src/lib/options/feedbackById.options.ts
@@ -0,0 +1,22 @@
+import { queryOptions } from "@tanstack/react-query";
+
+import { useFeedbackByIdQuery } from "generated/graphql";
+
+import type { FeedbackByIdQueryVariables } from "generated/graphql";
+
+interface Options extends FeedbackByIdQueryVariables {
+  /* Authenticated user ID. */
+  userId: FeedbackByIdQueryVariables["userId"];
+}
+
+/**
+ * Options for the feedback by ID query.
+ */
+const feedbackByIdOptions = (options: Options) =>
+  queryOptions({
+    queryKey: useFeedbackByIdQuery.getKey(options),
+    queryFn: useFeedbackByIdQuery.fetcher(options),
+    select: (data) => data?.post,
+  });
+
+export default feedbackByIdOptions;
diff --git a/src/lib/options/index.ts b/src/lib/options/index.ts
index 29a69c2c..342ee975 100644
--- a/src/lib/options/index.ts
+++ b/src/lib/options/index.ts
@@ -1,3 +1,6 @@
+export { default as feedbackByIdOptions } from "./feedbackById.options";
 export { default as freeTierCommentsOptions } from "./freeTierComments.options";
 export { default as freeTierFeedbackOptions } from "./freeTierFeedback.options";
+export { default as infinitePostsOptions } from "./infinitePosts.options";
+export { default as projectOptions } from "./project.options";
 export { default as subscriptionOptions } from "./subscription.options";
diff --git a/src/lib/options/infinitePosts.options.ts b/src/lib/options/infinitePosts.options.ts
new file mode 100644
index 00000000..426b837d
--- /dev/null
+++ b/src/lib/options/infinitePosts.options.ts
@@ -0,0 +1,40 @@
+import { infiniteQueryOptions } from "@tanstack/react-query";
+
+import {
+  PostOrderBy,
+  useInfinitePostsQuery,
+  usePostsQuery,
+} from "generated/graphql";
+
+import type { PostsQueryVariables } from "generated/graphql";
+
+interface Options extends Omit<PostsQueryVariables, "orderBy"> {
+  /* Authenticated user ID. */
+  userId: PostsQueryVariables["userId"];
+  /** Order by option for posts. Derived from search parameters. */
+  orderBy: string | null;
+}
+
+/**
+ * Options for the infinite posts query.
+ */
+const infinitePostsOptions = (options: Options) => {
+  const variables: PostsQueryVariables = {
+    ...options,
+    orderBy: options.orderBy
+      ? [options.orderBy as PostOrderBy, PostOrderBy.CreatedAtDesc]
+      : undefined,
+  };
+
+  return infiniteQueryOptions({
+    queryKey: useInfinitePostsQuery.getKey(variables),
+    queryFn: usePostsQuery.fetcher(variables),
+    initialPageParam: undefined,
+    getNextPageParam: (lastPage) =>
+      lastPage?.posts?.pageInfo?.hasNextPage
+        ? { after: lastPage?.posts?.pageInfo?.endCursor }
+        : undefined,
+  });
+};
+
+export default infinitePostsOptions;
diff --git a/src/lib/options/project.options.ts b/src/lib/options/project.options.ts
new file mode 100644
index 00000000..bfe9d4f3
--- /dev/null
+++ b/src/lib/options/project.options.ts
@@ -0,0 +1,18 @@
+import { queryOptions } from "@tanstack/react-query";
+
+import { useProjectQuery } from "generated/graphql";
+
+import type { ProjectQueryVariables } from "generated/graphql";
+
+interface Options extends ProjectQueryVariables {
+  /* Authenticated user ID. */
+  userId: ProjectQueryVariables["userId"];
+}
+
+const projectOptions = (options: Options) =>
+  queryOptions({
+    queryKey: useProjectQuery.getKey(options),
+    queryFn: useProjectQuery.fetcher(options),
+  });
+
+export default projectOptions;
diff --git a/src/lib/options/subscription.options.ts b/src/lib/options/subscription.options.ts
index 9c1c6890..1d3b07ec 100644
--- a/src/lib/options/subscription.options.ts
+++ b/src/lib/options/subscription.options.ts
@@ -12,7 +12,7 @@ interface Options {
 const subscriptionOptions = ({ hidraId, enabled = true }: Options) =>
   queryOptions({
     queryKey: ["Subscription", { hidraId }],
-    queryFn: async () => getSubscription(hidraId!),
+    queryFn: async () => getSubscription(),
     enabled: enabled && !!hidraId,
     retry: false,
   });
diff --git a/src/lib/util/getQueryClient/getQueryClient.ts b/src/lib/util/getQueryClient/getQueryClient.ts
index 4dade1a4..8620930a 100644
--- a/src/lib/util/getQueryClient/getQueryClient.ts
+++ b/src/lib/util/getQueryClient/getQueryClient.ts
@@ -14,8 +14,6 @@ const makeQueryClient = () => {
       queries: {
         // NB: with SSR, it is recommended to set a default staleTime above 0 to avoid refetching immediately on the client. See: https://tanstack.com/query/latest/docs/framework/react/guides/advanced-ssr#initial-setup
         staleTime: 60 * 1000,
-        // NB: Next.js middleware validates / alters the session which the queries depend on. This option is set to prevent refetching queries when the access token may be invalid
-        refetchOnWindowFocus: false,
       },
     },
   });
diff --git a/src/middleware.ts b/src/middleware.ts
index 063b3c44..4e6ca4be 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -67,20 +67,19 @@ export const middleware = auth(async (request) => {
     return NextResponse.json({}, { status: 200 });
   }
 
-  // If the user is not authenticated, redirect to the landing page
-  if (!request.auth) {
-    return redirect(request);
-  }
-
   // If there is an error from the refresh token rotation, sign out the user (i.e. refresh token was expired)
-  if (request.auth.error) {
+  if (request.auth?.error) {
     return await signOut(request);
   }
 
   // Redirect user to their profile page upon successful checkout (or force redirect when trying to access confirmation route)
   if (request.nextUrl.pathname.startsWith("/confirmation")) {
+    if (!request.auth) {
+      return redirect(request);
+    }
+
     return NextResponse.redirect(
-      `${process.env.NEXT_PUBLIC_BASE_URL}/profile/${request.auth.user?.hidraId}/subscription`,
+      `${process.env.NEXT_PUBLIC_BASE_URL}/profile/${request.auth?.user?.hidraId}/subscription`,
     );
   }