diff --git a/src/components/invoice-creator.tsx b/src/components/invoice-creator.tsx
index 3aae045a..0942995d 100644
--- a/src/components/invoice-creator.tsx
+++ b/src/components/invoice-creator.tsx
@@ -81,8 +81,8 @@ export function InvoiceCreator({
     defaultValues: {
       invoiceNumber: generateInvoiceNumber(invoiceCount),
       dueDate: "",
-      creatorName: !isInvoiceMe ? (currentUser?.name ?? "") : "",
-      creatorEmail: !isInvoiceMe ? (currentUser?.email ?? "") : "",
+      creatorName: currentUser?.name ?? "",
+      creatorEmail: currentUser?.email ?? "",
       clientName: recipientDetails?.clientName ?? "",
       clientEmail: recipientDetails?.clientEmail ?? "",
       invoicedTo: recipientDetails?.userId ?? "",
diff --git a/src/server/routers/invoice.ts b/src/server/routers/invoice.ts
index 01ecd6f5..c970b1bf 100644
--- a/src/server/routers/invoice.ts
+++ b/src/server/routers/invoice.ts
@@ -148,7 +148,7 @@ export const invoiceRouter = router({
   createFromInvoiceMe: publicProcedure
     .input(invoiceFormSchema)
     .mutation(async ({ ctx, input }) => {
-      const { db } = ctx;
+      const { db, session } = ctx;
 
       if (!input.invoicedTo) {
         throw new TRPCError({
@@ -177,7 +177,7 @@ export const invoiceRouter = router({
             {
               ...input,
             },
-            input.invoicedTo as string,
+            session?.userId || (input?.invoicedTo as string),
           );
         });
       } catch (error) {