diff --git a/packages/client/src/actions/authentication.ts b/packages/client/src/actions/authentication.ts
index 08fc62ea9..7cfba3d08 100644
--- a/packages/client/src/actions/authentication.ts
+++ b/packages/client/src/actions/authentication.ts
@@ -155,6 +155,6 @@ export function switchAccount(
  */
 export function fetchMeDetails<TAccount extends Account>(
   client: SessionClient<Context<TAccount>>,
-): ResultAsync<MeResult, UnauthenticatedError | UnexpectedError> {
+): ResultAsync<MeResult<TAccount>, UnauthenticatedError | UnexpectedError> {
   return client.query(meQuery([client.context.accountFragment]), {});
 }
diff --git a/packages/graphql/src/accounts/account.ts b/packages/graphql/src/accounts/account.ts
index d09faa95c..7caa73e58 100644
--- a/packages/graphql/src/accounts/account.ts
+++ b/packages/graphql/src/accounts/account.ts
@@ -222,7 +222,7 @@ export const AccountGraphsStatsQuery = graphql(
 
 export type AccountGraphsStatsRequest = RequestOf<typeof AccountGraphsStatsQuery>;
 
-export const AccountsAvailableQuery = graphql(
+export const AccountsAvailableQuery = dynamic(
   `query AccountsAvailable($request: AccountsAvailableRequest!) {
     value: accountsAvailable(request: $request) {
       items{
diff --git a/packages/graphql/src/authentication.ts b/packages/graphql/src/authentication.ts
index 7ea7be5e0..6dc6e2f08 100644
--- a/packages/graphql/src/authentication.ts
+++ b/packages/graphql/src/authentication.ts
@@ -1,8 +1,8 @@
 import type { FragmentOf } from 'gql.tada';
 import {
   type Account,
+  type AccountAvailable,
   AccountAvailableFragment,
-  type FullAccount,
   PaginatedResultInfoFragment,
 } from './fragments';
 import {
@@ -222,24 +222,20 @@ const MeResultFragment = partial(
       window
     }
     loggedInAs {
-      ...AccountAvailable
+      ${'...AccountAvailable'}
     }
   }`,
   [AccountAvailableFragment],
 );
-export type MeDetails<TAccount extends Account> = PartialFragmentOf<
+export type MeResult<TAccount extends Account> = PartialFragmentOf<
   typeof MeResultFragment,
-  [FragmentDocumentFor<TAccount>]
+  [FragmentDocumentFor<AccountAvailable<TAccount>>]
 >;
 
-type test = MeDetails<FullAccount>;
-
-export type MeResult = FragmentOf<typeof MeResultFragment>;
-
 export const meQuery = dynamic(
   `query Me {
     value: me {
-      ...MeResult
+      ${'...MeResult'}
     }
   }`,
   [MeResultFragment],
diff --git a/packages/graphql/src/fragments/account.ts b/packages/graphql/src/fragments/account.ts
index 1bc188b5c..2c2074962 100644
--- a/packages/graphql/src/fragments/account.ts
+++ b/packages/graphql/src/fragments/account.ts
@@ -124,12 +124,12 @@ const AccountManagedFragment = partial(
   `fragment AccountManaged on AccountManaged {
     __typename
     addedAt
-    account {
-      ...Account
-    }
     permissions {
       ...AccountManagerPermissions
     }
+    account {
+      ...Account
+    }
   }`,
   [AccountManagerPermissionsFragment],
 );
@@ -146,8 +146,8 @@ const AccountOwnedFragment = partial(
       ...Account
     }
   }`,
-  [],
 );
+
 export type AccountOwned<TAccount extends Account> = PartialFragmentOf<
   typeof AccountOwnedFragment,
   [FragmentDocumentFor<TAccount>]
diff --git a/packages/graphql/src/fragments/post.ts b/packages/graphql/src/fragments/post.ts
index 958e96ac3..1a38badac 100644
--- a/packages/graphql/src/fragments/post.ts
+++ b/packages/graphql/src/fragments/post.ts
@@ -275,24 +275,6 @@ export const FullPostFieldsFragment = graphql(
  */
 export type FullPostFields = FragmentOf<typeof FullPostFieldsFragment>;
 
-export const ReferencedPostFragment = partial(
-  `fragment ReferencedPost on Post {
-    ${'...PostFields'}
-      
-    author {
-      ...Account
-    }
-  }`,
-);
-
-export type ReferencedPost<
-  TPostFields extends PostFields = PostFields,
-  TAccount extends Account = Account,
-> = PartialFragmentOf<
-  typeof ReferencedPostFragment,
-  [FragmentDocumentFor<TPostFields, 'Post', 'PostFields'>, FragmentDocumentFor<TAccount>]
->;
-
 export const PostFragment = partial(
   `fragment Post on Post {
     ${'...PostFields'}
@@ -301,16 +283,27 @@ export const PostFragment = partial(
       ...Account
     }
     root {
-      ${'...ReferencedPost'}
+      ${'...PostFields'}
+      
+      author {
+        ...Account
+      }
     }
     quoteOf {
-      ${'...ReferencedPost'}
+      ${'...PostFields'}
+      
+      author {
+        ...Account
+      }
     }
     commentOn {
-      ${'...ReferencedPost'}
+      ${'...PostFields'}
+      
+      author {
+        ...Account
+      }
     }
   }`,
-  [ReferencedPostFragment],
 );
 
 export type Post<
@@ -339,19 +332,33 @@ export const RepostFragment = partial(
       author {
         ...Account
       }
+
       root {
-        ${'...ReferencedPost'}
+        ${'...PostFields'}
+      
+        author {
+          ...Account
+        }
       }
       quoteOf {
-        ${'...ReferencedPost'}
+        ${'...PostFields'}
+      
+        author {
+          ...Account
+        }
       }
       commentOn {
-        ${'...ReferencedPost'}
+        ${'...PostFields'}
+      
+        author {
+          ...Account
+        }
       }
     }
   }`,
-  [AppFragment, PostFragment],
+  [AppFragment],
 );
+
 export type Repost<
   TPostFields extends PostFields = PostFields,
   TAccount extends Account = Account,
diff --git a/packages/graphql/src/graphql.ts b/packages/graphql/src/graphql.ts
index f7b237be5..0ee9cd7fe 100644
--- a/packages/graphql/src/graphql.ts
+++ b/packages/graphql/src/graphql.ts
@@ -273,12 +273,20 @@ export type PartialFragmentOf<
   ? FragmentOf<FragmentDocumentFrom<In, [...StaticFragments, ...DynamicFragments]>>
   : never;
 
-export type DynamicDocument<In extends string, StaticFragments extends FragmentShape[] = []> = <
-  DynamicFragments extends FragmentShape[],
->(
+export type DynamicDocument<
+  In extends string = string,
+  StaticFragments extends FragmentShape[] = [],
+> = <DynamicFragments extends FragmentShape[]>(
   dynamicFragments: DynamicFragments,
 ) => GetDocumentNode<In, [...StaticFragments, ...DynamicFragments]>;
 
+export type DynamicFragmentOf<
+  Document extends DynamicDocument,
+  DynamicFragments extends FragmentShape[],
+> = Document extends DynamicDocument<infer In, infer StaticFragments>
+  ? FragmentOf<FragmentDocumentFrom<In, [...StaticFragments, ...DynamicFragments]>>
+  : never;
+
 /**
  * @internal
  */