diff --git a/package.json b/package.json
index 556846b8..c5afca74 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
         "db:studio": "drizzle-kit studio",
         "build": "next build && tsc --project tsconfig.server.json && tsc-alias -p tsconfig.server.json",
         "start": "ENVIRONMENT=prod node dist/server/index.js",
-        "email": "email dev --dir emailTemplates --port 3002"
+        "email": "email dev --dir server/emails/templates --port 3002"
     },
     "dependencies": {
         "@lucia-auth/adapter-drizzle": "1.1.0",
diff --git a/server/emails/sendEmail.ts b/server/emails/sendEmail.ts
index 62745272..7ea91953 100644
--- a/server/emails/sendEmail.ts
+++ b/server/emails/sendEmail.ts
@@ -16,6 +16,11 @@ export async function sendEmail(
         return;
     }
 
+    if (!opts.from || !opts.to || !opts.subject) {
+        logger.error("Email missing required fields", opts);
+        return;
+    }
+
     const emailHtml = await render(template);
 
     const options = {
@@ -26,8 +31,6 @@ export async function sendEmail(
     };
 
     await emailClient.sendMail(options);
-
-    logger.debug(`Sent email to ${opts.to}`);
 }
 
 export default sendEmail;
diff --git a/server/environment.ts b/server/environment.ts
index 6a764332..b4efe48e 100644
--- a/server/environment.ts
+++ b/server/environment.ts
@@ -43,6 +43,7 @@ const environmentSchema = z.object({
         .pipe(z.number().optional()),
     EMAIL_SMTP_USER: z.string().optional(),
     EMAIL_SMTP_PASS: z.string().optional(),
+    EMAIL_NOREPLY: z.string().optional(),
 });
 
 const environment = {