diff --git a/packages/auth/package.json b/packages/auth/package.json
index defc3d1cce..78cae323a7 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -10,7 +10,8 @@
 		"format": "prettier --write --cache --cache-strategy metadata .",
 		"lint": "eslint --cache .",
 		"lint:fix": "eslint --cache --fix .",
-		"type-check": "tsc --noEmit"
+		"type-check": "tsc --noEmit",
+		"with-env": "dotenv -e ../../.env --"
 	},
 	"dependencies": {
 		"@aws-sdk/client-cognito-identity-provider": "3.352.0",
diff --git a/packages/aws-messaging/src/index.ts b/packages/aws-messaging/src/index.ts
index 2584ee0914..1e63694002 100644
--- a/packages/aws-messaging/src/index.ts
+++ b/packages/aws-messaging/src/index.ts
@@ -42,6 +42,7 @@ export const handler = (
 
 	switch (triggerSource) {
 		case 'CustomMessage_AdminCreateUser':
+		case 'CustomMessage_ResendCode':
 		case 'CustomMessage_SignUp': {
 			response.emailSubject = subject
 			response.emailMessage = `${message} ${confirmLink}`
diff --git a/packages/env/index.ts b/packages/env/index.ts
index f541ebf9fd..cf728d5d37 100644
--- a/packages/env/index.ts
+++ b/packages/env/index.ts
@@ -4,7 +4,7 @@ import { z } from 'zod'
 
 export const env = createEnv({
 	server: {
-		NODE_ENV: z.enum(['development', 'production', 'test']),
+		NODE_ENV: z.enum(['development', 'production', 'test']).optional(),
 		DATABASE_URL: z.string().url(),
 		DB_DIRECT_URL: z.string().url(),
 		KV_URL: z.string().url(),