diff --git a/apps/web/tests/vote-and-comment.spec.ts b/apps/web/tests/vote-and-comment.spec.ts
index cbd58e5625..23e20a594f 100644
--- a/apps/web/tests/vote-and-comment.spec.ts
+++ b/apps/web/tests/vote-and-comment.spec.ts
@@ -76,7 +76,9 @@ test.describe.parallel(() => {
       wait: 5000,
     });
 
-    expect(email.headers.subject).toBe("Response submitted for Lunch Meeting");
+    expect(email.headers.subject).toBe(
+      "Thanks for responding to Lunch Meeting",
+    );
 
     const $ = load(email.html);
     const href = $("#editSubmissionUrl").attr("href");
diff --git a/packages/backend/package.json b/packages/backend/package.json
index cd251dd9ba..892ea27de7 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -2,6 +2,9 @@
   "name": "@rallly/backend",
   "version": "0.0.0",
   "private": true,
+  "scripts": {
+    "lint:tsc": "tsc --noEmit"
+  },
   "main": "src/index.ts",
   "types": "src/index.ts",
   "dependencies": {
diff --git a/packages/backend/session.ts b/packages/backend/session.ts
index 136557ce88..da5f99dfad 100644
--- a/packages/backend/session.ts
+++ b/packages/backend/session.ts
@@ -10,7 +10,7 @@ declare module "iron-session" {
   }
 }
 
-export const decryptToken = async <P = UserSessionData>(
+export const decryptToken = async <P extends Record<string, unknown>>(
   token: string,
 ): Promise<P | null> => {
   const payload = await unsealData(token, {
@@ -23,7 +23,7 @@ export const decryptToken = async <P = UserSessionData>(
   return payload as P;
 };
 
-export const createToken = async <T = UserSessionData>(
+export const createToken = async <T extends Record<string, unknown>>(
   payload: T,
   options?: {
     ttl?: number;
diff --git a/packages/backend/trpc/routers/auth.ts b/packages/backend/trpc/routers/auth.ts
index 4b4d978ffd..38954f95de 100644
--- a/packages/backend/trpc/routers/auth.ts
+++ b/packages/backend/trpc/routers/auth.ts
@@ -84,7 +84,7 @@ export const auth = router({
           return { ok: false, reason: "userAlreadyExists" };
         }
 
-        const code = await generateOtp();
+        const code = generateOtp();
 
         const token = await createToken<RegistrationTokenPayload>({
           name: input.name,
@@ -94,7 +94,7 @@ export const auth = router({
 
         await sendEmail("RegisterEmail", {
           to: input.email,
-          subject: "Please verify your email address",
+          subject: `${input.name}, please verify your email address`,
           props: {
             code,
             name: input.name,
@@ -171,7 +171,7 @@ export const auth = router({
           return { ok: false, reason: "userNotFound" };
         }
 
-        const code = await generateOtp();
+        const code = generateOtp();
 
         const token = await createToken<LoginTokenPayload>({
           userId: user.id,
@@ -180,7 +180,7 @@ export const auth = router({
 
         await sendEmail("LoginEmail", {
           to: input.email,
-          subject: "Login",
+          subject: `${code} is your 6-digit code`,
           props: {
             name: user.name,
             code,
diff --git a/packages/backend/trpc/routers/polls/comments.ts b/packages/backend/trpc/routers/polls/comments.ts
index b6c0aea82c..1a2f27945a 100644
--- a/packages/backend/trpc/routers/polls/comments.ts
+++ b/packages/backend/trpc/routers/polls/comments.ts
@@ -83,7 +83,7 @@ export const comments = router({
         emailsToSend.push(
           sendEmail("NewCommentEmail", {
             to: email,
-            subject: `New comment on ${poll.title}`,
+            subject: `${authorName} has commented on ${poll.title}`,
             props: {
               name: watcher.user.name,
               authorName,
diff --git a/packages/backend/trpc/routers/polls/participants.ts b/packages/backend/trpc/routers/polls/participants.ts
index 453f19175d..3edc6cfc6c 100644
--- a/packages/backend/trpc/routers/polls/participants.ts
+++ b/packages/backend/trpc/routers/polls/participants.ts
@@ -101,7 +101,7 @@ export const participants = router({
         emailsToSend.push(
           sendEmail("NewParticipantConfirmationEmail", {
             to: email,
-            subject: `Response submitted for ${poll.title}`,
+            subject: `Thanks for responding to ${poll.title}`,
             props: {
               name,
               title: poll.title,
@@ -138,7 +138,7 @@ export const participants = router({
         emailsToSend.push(
           sendEmail("NewParticipantEmail", {
             to: email,
-            subject: `New response for ${poll.title}`,
+            subject: `${participant.name} has responded to ${poll.title}`,
             props: {
               name: watcher.user.name,
               participantName: participant.name,