diff --git a/apps/remix/app/types/embed-authoring-base-schema.ts b/apps/remix/app/types/embed-authoring-base-schema.ts
index 2d3a50282..e85addf1e 100644
--- a/apps/remix/app/types/embed-authoring-base-schema.ts
+++ b/apps/remix/app/types/embed-authoring-base-schema.ts
@@ -4,7 +4,6 @@ import { ZBaseEmbedDataSchema } from './embed-base-schemas';
 
 export const ZBaseEmbedAuthoringSchema = z
   .object({
-    token: z.string(),
     externalId: z.string().optional(),
     features: z
       .object({
diff --git a/apps/remix/server/router.ts b/apps/remix/server/router.ts
index e64f7d292..5eb448933 100644
--- a/apps/remix/server/router.ts
+++ b/apps/remix/server/router.ts
@@ -1,6 +1,7 @@
 import { Hono } from 'hono';
 import { rateLimiter } from 'hono-rate-limiter';
 import { contextStorage } from 'hono/context-storage';
+import { cors } from 'hono/cors';
 import { requestId } from 'hono/request-id';
 import type { RequestIdVariables } from 'hono/request-id';
 import type { Logger } from 'pino';
@@ -83,12 +84,14 @@ app.route('/api/auth', auth);
 app.route('/api/files', filesRoute);
 
 // API servers.
+app.use(`/api/v1/*`, cors());
 app.route('/api/v1', tsRestHonoApp);
 app.use('/api/jobs/*', jobsClient.getApiHandler());
 app.use('/api/trpc/*', reactRouterTrpcServer);
 
 // Unstable API server routes. Order matters for these two.
 app.get(`${API_V2_BETA_URL}/openapi.json`, (c) => c.json(openApiDocument));
+app.use(`${API_V2_BETA_URL}/*`, cors());
 app.use(`${API_V2_BETA_URL}/*`, async (c) => openApiTrpcServerHandler(c));
 
 export default app;
diff --git a/packages/lib/types/document-meta.ts b/packages/lib/types/document-meta.ts
index 51b17c12e..ed4e3c331 100644
--- a/packages/lib/types/document-meta.ts
+++ b/packages/lib/types/document-meta.ts
@@ -137,7 +137,7 @@ export const ZDocumentMetaCreateSchema = z.object({
   drawSignatureEnabled: ZDocumentMetaDrawSignatureEnabledSchema.optional(),
   emailId: z.string().nullish(),
   emailReplyTo: z.string().email().nullish(),
-  emailSettings: ZDocumentEmailSettingsSchema.optional(),
+  emailSettings: ZDocumentEmailSettingsSchema.nullish(),
   expiryAmount: ZDocumentExpiryAmountSchema.optional(),
   expiryUnit: ZDocumentExpiryUnitSchema.optional(),
 });
diff --git a/packages/trpc/server/document-router/create-document-temporary.ts b/packages/trpc/server/document-router/create-document-temporary.ts
index 93bf08bac..4b0a0669e 100644
--- a/packages/trpc/server/document-router/create-document-temporary.ts
+++ b/packages/trpc/server/document-router/create-document-temporary.ts
@@ -98,6 +98,7 @@ export const createDocumentTemporaryRoute = authenticatedProcedure
       },
       meta: {
         ...meta,
+        emailSettings: meta?.emailSettings ?? undefined,
         expiryAmount,
         expiryUnit,
       },
diff --git a/packages/trpc/server/document-router/distribute-document.ts b/packages/trpc/server/document-router/distribute-document.ts
index 79bce76e2..3182bc2ef 100644
--- a/packages/trpc/server/document-router/distribute-document.ts
+++ b/packages/trpc/server/document-router/distribute-document.ts
@@ -37,7 +37,7 @@ export const distributeDocumentRoute = authenticatedProcedure
         timezone: meta.timezone,
         redirectUrl: meta.redirectUrl,
         distributionMethod: meta.distributionMethod,
-        emailSettings: meta.emailSettings,
+        emailSettings: meta.emailSettings ?? undefined,
         language: meta.language,
         emailId: meta.emailId,
         emailReplyTo: meta.emailReplyTo,
diff --git a/packages/trpc/server/envelope-router/distribute-envelope.ts b/packages/trpc/server/envelope-router/distribute-envelope.ts
index 0b4e1929d..003727007 100644
--- a/packages/trpc/server/envelope-router/distribute-envelope.ts
+++ b/packages/trpc/server/envelope-router/distribute-envelope.ts
@@ -35,7 +35,7 @@ export const distributeEnvelopeRoute = authenticatedProcedure
         timezone: meta.timezone,
         redirectUrl: meta.redirectUrl,
         distributionMethod: meta.distributionMethod,
-        emailSettings: meta.emailSettings,
+        emailSettings: meta.emailSettings ?? undefined,
         language: meta.language,
         emailId: meta.emailId,
         emailReplyTo: meta.emailReplyTo,