diff --git a/backend/codegen.ts b/backend/codegen.ts
index be3f44e..aff6e02 100644
--- a/backend/codegen.ts
+++ b/backend/codegen.ts
@@ -14,22 +14,13 @@ const config: CodegenConfig = {
   },
   hooks: {
     afterOneFileWrite: [
-      'sed -i \'\' -e \'1s|import { GraphQLResolveInfo, GraphQLScalarType, GraphQLScalarTypeConfig } from "graphql";|import { type GraphQLResolveInfo, GraphQLScalarType, type GraphQLScalarTypeConfig } from "graphql";|\' src/__generated__/resolvers-types.ts',
+      "sed -i '' 's/import { GraphQLResolveInfo, GraphQLScalarType, GraphQLScalarTypeConfig } from '\\''graphql'\\'';/import type { GraphQLResolveInfo, GraphQLScalarType, GraphQLScalarTypeConfig } from '\\''graphql'\\'';/g' src/__generated__/resolvers-types.ts\n",
+      "sed -i '' 's/import { ApolloContext } from '\\''..\\/server\\/apollo.js'\\'';/import type { ApolloContext } from '\\''..\\/server\\/apollo.js'\\'';/g' src/__generated__/resolvers-types.ts\n",
     ],
   },
   config: {
     useIndexSignature: true,
     contextType: '../server/apollo.js#ApolloContext',
-    mappers: {
-      // Project: '../db/models/types.js#Project as ProjectModel',
-      // ProjectTag: '../db/models/types.js#ProjectTag as ProjectTagModel',
-      // CustomField: '../db/models/types.js#ProjectCustomField as ProjectCustomFieldModel',
-      // User: '../db/models/types.js#User as UserModel',
-      // Issue: '../db/models/types.js#Issue as IssueModel',
-      // IssueComment: '../db/models/types.js#IssueComment as IssueCommentModel',
-      // Board: '../db/models/types.js#Board as BoardModel',
-      // IssueStatus: '../db/models/types.js#IssueStatus as IssueStatusModel',
-    },
   },
 };
 
diff --git a/backend/src/resolvers/issue-comment/index.ts b/backend/src/resolvers/issue-comment/index.ts
index 9f6676b..0d27c40 100644
--- a/backend/src/resolvers/issue-comment/index.ts
+++ b/backend/src/resolvers/issue-comment/index.ts
@@ -1,4 +1,5 @@
 import type { IssueCommentResolvers, MutationResolvers } from '../../__generated__/resolvers-types.js';
+import { formatUserForGraphql } from '../user/helpers.js';
 
 const Mutation: MutationResolvers = {
   createIssueComment: async (parent, { input }, { db, user }) => {
@@ -52,6 +53,8 @@ const Mutation: MutationResolvers = {
 
     await findIssueComment.save();
 
+    dataLoaderContext.prime(findIssueComment);
+
     return {
       ...findIssueComment.toJSON(),
       id: `${findIssueComment.id}`,
@@ -70,10 +73,7 @@ const IssueComment: IssueCommentResolvers = {
       [EXPECTED_OPTIONS_KEY]: dataLoaderContext,
     });
 
-    return {
-      ...dbUser.toJSON(),
-      id: `${dbUser.id}`,
-    };
+    return formatUserForGraphql(dbUser);
   },
 };
 
diff --git a/backend/src/resolvers/issue/index.ts b/backend/src/resolvers/issue/index.ts
index 44670b2..c2bc042 100644
--- a/backend/src/resolvers/issue/index.ts
+++ b/backend/src/resolvers/issue/index.ts
@@ -13,7 +13,7 @@ import {
 } from '../../__generated__/resolvers-types.js';
 import { Issue as IssueModel } from '../../db/models/types.js';
 import { websocketBroadcast } from '../../services/ws-server.js';
-import { formatUserForGraphql } from '../user/helpers';
+import { formatUserForGraphql } from '../user/helpers.js';
 
 const Query: QueryResolvers = {
   issues: async (parent, { input: { projectId, id, search, searchOperator } }, { db, dataLoaderContext }) => {
diff --git a/backend/src/resolvers/project/index.ts b/backend/src/resolvers/project/index.ts
index 89ffd39..51f06ec 100644
--- a/backend/src/resolvers/project/index.ts
+++ b/backend/src/resolvers/project/index.ts
@@ -9,7 +9,7 @@ import {
   type Resolvers,
   type ViewState,
 } from '../../__generated__/resolvers-types.js';
-import { formatUserForGraphql } from '../user/helpers';
+import { formatUserForGraphql } from '../user/helpers.js';
 
 const Query: QueryResolvers = {
   projects: async (parent, args, { db, dataLoaderContext }) => {