diff --git a/apps/web/server/routers/viewer.tsx b/apps/web/server/routers/viewer.tsx
index 3c70706a92..c040648b3e 100644
--- a/apps/web/server/routers/viewer.tsx
+++ b/apps/web/server/routers/viewer.tsx
@@ -895,7 +895,8 @@ const loggedInViewerRouter = createProtectedRouter()
       const { rating, comment } = input;
 
       const feedback = {
-        userId: ctx.user.id,
+        username: ctx.user.name || "Nameless",
+        email: ctx.user.email || "No email address",
         rating: rating,
         comment: comment,
       };
diff --git a/packages/emails/src/templates/FeedbackEmail.tsx b/packages/emails/src/templates/FeedbackEmail.tsx
index 88846b1a96..a8b8be0dc7 100644
--- a/packages/emails/src/templates/FeedbackEmail.tsx
+++ b/packages/emails/src/templates/FeedbackEmail.tsx
@@ -1,7 +1,8 @@
 import { BaseEmailHtml, Info } from "../components";
 
 export interface Feedback {
-  userId: number;
+  username: string;
+  email: string;
   rating: string;
   comment: string;
 }
@@ -9,7 +10,8 @@ export interface Feedback {
 export const FeedbackEmail = (props: Feedback & Partial<React.ComponentProps<typeof BaseEmailHtml>>) => {
   return (
     <BaseEmailHtml subject="Feedback" title="Feedback">
-      <Info label="User id" description={props.userId} withSpacer />
+      <Info label="Username" description={props.username} withSpacer />
+      <Info label="Email" description={props.email} withSpacer />
       <Info label="Rating" description={props.rating} withSpacer />
       <Info label="Comment" description={props.comment} withSpacer />
     </BaseEmailHtml>
diff --git a/packages/emails/templates/feedback-email.ts b/packages/emails/templates/feedback-email.ts
index b6f8683d33..289a0cedce 100644
--- a/packages/emails/templates/feedback-email.ts
+++ b/packages/emails/templates/feedback-email.ts
@@ -1,9 +1,9 @@
 import { renderEmail } from "../";
-
 import BaseEmail from "./_base-email";
 
 export interface Feedback {
-  userId: number;
+  username: string;
+  email: string;
   rating: string;
   comment: string;
 }
@@ -28,7 +28,8 @@ export default class FeedbackEmail extends BaseEmail {
 
   protected getTextBody(): string {
     return `
-User id: ${this.feedback.userId}
+User: ${this.feedback.username}
+Email: ${this.feedback.email}
 Rating: ${this.feedback.rating}
 Comment: ${this.feedback.comment}
     `;