diff --git a/src/components/adminPage/mail/mailDeviceIpChangeNotificationTemplate.tsx b/src/components/adminPage/mail/mailDeviceIpChangeNotificationTemplate.tsx
index 9485d917..e6b479f4 100644
--- a/src/components/adminPage/mail/mailDeviceIpChangeNotificationTemplate.tsx
+++ b/src/components/adminPage/mail/mailDeviceIpChangeNotificationTemplate.tsx
@@ -7,6 +7,7 @@ import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,
 } from "~/hooks/useTrpcApiHandler";
+import { MailTemplateKey } from "~/utils/enums";
 
 type IMailTemplate = {
 	subject: string;
@@ -35,7 +36,7 @@ const DeviceIpChangeNotificationTemplate = () => {
 		refetch: refetchMailTemplates,
 		isLoading: loadingTemplates,
 	} = api.admin.getMailTemplates.useQuery({
-		template: "deviceIpChangeNotificationTemplate",
+		template: MailTemplateKey.DeviceIpChangeNotification,
 	});
 
 	const changeTemplateHandler = (
@@ -103,7 +104,7 @@ const DeviceIpChangeNotificationTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(stateTemplate),
-				type: "deviceIpChangeNotificationTemplate",
+				type: MailTemplateKey.DeviceIpChangeNotification,
 			},
 			{
 				onSuccess: handleApiSuccess({
@@ -179,7 +180,7 @@ const DeviceIpChangeNotificationTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "deviceIpChangeNotificationTemplate",
+								template: MailTemplateKey.DeviceIpChangeNotification,
 							})
 						}
 					>
@@ -190,7 +191,9 @@ const DeviceIpChangeNotificationTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "deviceIpChangeNotificationTemplate" })}
+						onClick={() =>
+							sendTestMail({ type: MailTemplateKey.DeviceIpChangeNotification })
+						}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")
diff --git a/src/components/adminPage/mail/mailForgotPasswordTemplate.tsx b/src/components/adminPage/mail/mailForgotPasswordTemplate.tsx
index 832cd007..04460658 100644
--- a/src/components/adminPage/mail/mailForgotPasswordTemplate.tsx
+++ b/src/components/adminPage/mail/mailForgotPasswordTemplate.tsx
@@ -8,6 +8,7 @@ import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,
 } from "~/hooks/useTrpcApiHandler";
+import { MailTemplateKey } from "~/utils/enums";
 
 type InviteUserTemplate = {
 	subject: string;
@@ -35,7 +36,7 @@ const ForgotPasswordMailTemplate = () => {
 		refetch: refetchMailTemplates,
 		isLoading: loadingTemplates,
 	} = api.admin.getMailTemplates.useQuery({
-		template: "forgotPasswordTemplate",
+		template: MailTemplateKey.ForgotPassword,
 	});
 
 	const changeTemplateHandler = (
@@ -104,7 +105,7 @@ const ForgotPasswordMailTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(emailTemplate),
-				type: "forgotPasswordTemplate",
+				type: MailTemplateKey.ForgotPassword,
 			},
 			{
 				onSuccess: () => {
@@ -178,7 +179,7 @@ const ForgotPasswordMailTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "forgotPasswordTemplate",
+								template: MailTemplateKey.ForgotPassword,
 							})
 						}
 					>
@@ -189,7 +190,7 @@ const ForgotPasswordMailTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "forgotPasswordTemplate" })}
+						onClick={() => sendTestMail({ type: MailTemplateKey.ForgotPassword })}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")
diff --git a/src/components/adminPage/mail/mailNewDeviceNotificationTemplate.tsx b/src/components/adminPage/mail/mailNewDeviceNotificationTemplate.tsx
index c69262ca..a194fa32 100644
--- a/src/components/adminPage/mail/mailNewDeviceNotificationTemplate.tsx
+++ b/src/components/adminPage/mail/mailNewDeviceNotificationTemplate.tsx
@@ -7,6 +7,7 @@ import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,
 } from "~/hooks/useTrpcApiHandler";
+import { MailTemplateKey } from "~/utils/enums";
 
 type IMailTemplate = {
 	subject: string;
@@ -35,7 +36,7 @@ const NewDeviceNotificationTemplate = () => {
 		refetch: refetchMailTemplates,
 		isLoading: loadingTemplates,
 	} = api.admin.getMailTemplates.useQuery({
-		template: "newDeviceNotificationTemplate",
+		template: MailTemplateKey.NewDeviceNotification,
 	});
 
 	const changeTemplateHandler = (
@@ -103,7 +104,7 @@ const NewDeviceNotificationTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(stateTemplate),
-				type: "newDeviceNotificationTemplate",
+				type: MailTemplateKey.NewDeviceNotification,
 			},
 			{
 				onSuccess: handleApiSuccess({
@@ -179,7 +180,7 @@ const NewDeviceNotificationTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "newDeviceNotificationTemplate",
+								template: MailTemplateKey.NewDeviceNotification,
 							})
 						}
 					>
@@ -190,7 +191,7 @@ const NewDeviceNotificationTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "newDeviceNotificationTemplate" })}
+						onClick={() => sendTestMail({ type: MailTemplateKey.NewDeviceNotification })}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")
diff --git a/src/components/adminPage/mail/mailNotificationTemplate.tsx b/src/components/adminPage/mail/mailNotificationTemplate.tsx
index 2181a621..16a75c4a 100644
--- a/src/components/adminPage/mail/mailNotificationTemplate.tsx
+++ b/src/components/adminPage/mail/mailNotificationTemplate.tsx
@@ -7,6 +7,7 @@ import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,
 } from "~/hooks/useTrpcApiHandler";
+import { MailTemplateKey } from "~/utils/enums";
 
 type IMailTemplate = {
 	subject: string;
@@ -35,7 +36,7 @@ const NotificationTemplate = () => {
 		refetch: refetchMailTemplates,
 		isLoading: loadingTemplates,
 	} = api.admin.getMailTemplates.useQuery({
-		template: "notificationTemplate",
+		template: MailTemplateKey.Notification,
 	});
 
 	const changeTemplateHandler = (
@@ -103,7 +104,7 @@ const NotificationTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(stateTemplate),
-				type: "notificationTemplate",
+				type: MailTemplateKey.Notification,
 			},
 			{
 				onSuccess: handleApiSuccess({
@@ -176,7 +177,7 @@ const NotificationTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "notificationTemplate",
+								template: MailTemplateKey.Notification,
 							})
 						}
 					>
@@ -187,7 +188,7 @@ const NotificationTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "notificationTemplate" })}
+						onClick={() => sendTestMail({ type: MailTemplateKey.Notification })}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")
diff --git a/src/components/adminPage/mail/mailOrganizationInviteTemplate.tsx b/src/components/adminPage/mail/mailOrganizationInviteTemplate.tsx
index da9e83d2..7ebb6ba8 100644
--- a/src/components/adminPage/mail/mailOrganizationInviteTemplate.tsx
+++ b/src/components/adminPage/mail/mailOrganizationInviteTemplate.tsx
@@ -7,6 +7,7 @@ import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,
 } from "~/hooks/useTrpcApiHandler";
+import { MailTemplateKey } from "~/utils/enums";
 
 type IMailTemplate = {
 	subject: string;
@@ -35,7 +36,7 @@ const OrganizationInviteTemplate = () => {
 		refetch: refetchMailTemplates,
 		isLoading: loadingTemplates,
 	} = api.admin.getMailTemplates.useQuery({
-		template: "inviteOrganizationTemplate",
+		template: MailTemplateKey.InviteOrganization,
 	});
 
 	const changeTemplateHandler = (
@@ -103,7 +104,7 @@ const OrganizationInviteTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(stateTemplate),
-				type: "inviteOrganizationTemplate",
+				type: MailTemplateKey.InviteOrganization,
 			},
 			{
 				onSuccess: handleApiSuccess({
@@ -178,7 +179,7 @@ const OrganizationInviteTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "inviteOrganizationTemplate",
+								template: MailTemplateKey.InviteOrganization,
 							})
 						}
 					>
@@ -189,7 +190,7 @@ const OrganizationInviteTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "inviteOrganizationTemplate" })}
+						onClick={() => sendTestMail({ type: MailTemplateKey.InviteOrganization })}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")
diff --git a/src/components/adminPage/mail/mailUserInviteTemplate.tsx b/src/components/adminPage/mail/mailUserInviteTemplate.tsx
index 22c58283..4338d123 100644
--- a/src/components/adminPage/mail/mailUserInviteTemplate.tsx
+++ b/src/components/adminPage/mail/mailUserInviteTemplate.tsx
@@ -8,6 +8,7 @@ import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,
 } from "~/hooks/useTrpcApiHandler";
+import { MailTemplateKey } from "~/utils/enums";
 
 type InviteUserTemplate = {
 	subject: string;
@@ -30,7 +31,7 @@ const MailUserInviteTemplate = () => {
 		refetch: refetchMailTemplates,
 		isLoading: loadingTemplates,
 	} = api.admin.getMailTemplates.useQuery({
-		template: "inviteUserTemplate",
+		template: MailTemplateKey.InviteUser,
 	});
 
 	const [emailTemplate, setEmailTemplate] = useState({
@@ -99,7 +100,7 @@ const MailUserInviteTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(emailTemplate),
-				type: "inviteUserTemplate",
+				type: MailTemplateKey.InviteUser,
 			},
 			{
 				onSuccess: handleApiSuccess({
@@ -175,7 +176,7 @@ const MailUserInviteTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "inviteUserTemplate",
+								template: MailTemplateKey.InviteUser,
 							})
 						}
 					>
@@ -186,7 +187,7 @@ const MailUserInviteTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "inviteUserTemplate" })}
+						onClick={() => sendTestMail({ type: MailTemplateKey.InviteUser })}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")
diff --git a/src/components/adminPage/mail/mailVerifyEmail.tsx b/src/components/adminPage/mail/mailVerifyEmail.tsx
index 15f00cad..8eca87e2 100644
--- a/src/components/adminPage/mail/mailVerifyEmail.tsx
+++ b/src/components/adminPage/mail/mailVerifyEmail.tsx
@@ -8,6 +8,7 @@ import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,
 } from "~/hooks/useTrpcApiHandler";
+import { MailTemplateKey } from "~/utils/enums";
 
 type InviteUserTemplate = {
 	subject: string;
@@ -35,7 +36,7 @@ const VerifyEmailTemplate = () => {
 		refetch: refetchMailTemplates,
 		isLoading: loadingTemplates,
 	} = api.admin.getMailTemplates.useQuery({
-		template: "verifyEmailTemplate",
+		template: MailTemplateKey.VerifyEmail,
 	});
 
 	const changeTemplateHandler = (
@@ -104,7 +105,7 @@ const VerifyEmailTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(emailTemplate),
-				type: "verifyEmailTemplate",
+				type: MailTemplateKey.VerifyEmail,
 			},
 			{
 				onSuccess: () => {
@@ -178,7 +179,7 @@ const VerifyEmailTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "verifyEmailTemplate",
+								template: MailTemplateKey.VerifyEmail,
 							})
 						}
 					>
@@ -189,7 +190,7 @@ const VerifyEmailTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "verifyEmailTemplate" })}
+						onClick={() => sendTestMail({ type: MailTemplateKey.VerifyEmail })}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")
diff --git a/src/server/api/routers/adminRoute.ts b/src/server/api/routers/adminRoute.ts
index 5b5705ca..c48d4791 100644
--- a/src/server/api/routers/adminRoute.ts
+++ b/src/server/api/routers/adminRoute.ts
@@ -19,6 +19,7 @@ import { ZT_FOLDER } from "~/utils/ztApi";
 import { isRunningInDocker } from "~/utils/docker";
 import { getNetworkClassCIDR } from "~/utils/IPv4gen";
 import { InvitationLinkType } from "~/types/invitation";
+import { MailTemplateKey } from "~/utils/enums";
 
 type WithError<T> = T & { error?: boolean; message?: string };
 
@@ -434,7 +435,7 @@ export const adminRouter = createTRPCRouter({
 	sendTestMail: adminRoleProtectedRoute
 		.input(
 			z.object({
-				type: z.string(),
+				type: z.nativeEnum(MailTemplateKey),
 			}),
 		)
 		.mutation(async ({ ctx, input }) => {
@@ -473,7 +474,7 @@ export const adminRouter = createTRPCRouter({
 				verifyLink: "https://ztnet.network/verify-email",
 			};
 
-			await sendMailWithTemplate(mailTemplateMap[type], {
+			await sendMailWithTemplate(type, {
 				to: user.email,
 				userId: user.id,
 				templateData,
diff --git a/src/server/api/routers/authRouter.ts b/src/server/api/routers/authRouter.ts
index 63b3b541..3d2e2cda 100644
--- a/src/server/api/routers/authRouter.ts
+++ b/src/server/api/routers/authRouter.ts
@@ -9,12 +9,7 @@ import {
 import { TRPCError } from "@trpc/server";
 import { throwError } from "~/server/helpers/errorHandler";
 import jwt from "jsonwebtoken";
-import {
-	forgotPasswordTemplate,
-	notificationTemplate,
-	sendMailWithTemplate,
-	verifyEmailTemplate,
-} from "~/utils/mail";
+import { sendMailWithTemplate } from "~/utils/mail";
 import * as ztController from "~/utils/ztApi";
 import {
 	API_TOKEN_SECRET,
@@ -28,6 +23,7 @@ import { Invitation, User, UserDevice, UserOptions } from "@prisma/client";
 import { validateOrganizationToken } from "../services/organizationAuthService";
 import rateLimit from "~/utils/rateLimit";
 import { ErrorCode } from "~/utils/errorCode";
+import { MailTemplateKey } from "~/utils/enums";
 
 // This regular expression (regex) is used to validate a password based on the following criteria:
 // - The password must be at least 6 characters long.
@@ -304,7 +300,7 @@ export const authRouter = createTRPCRouter({
 				});
 
 				for (const adminUser of adminUsers) {
-					await sendMailWithTemplate(notificationTemplate, {
+					await sendMailWithTemplate(MailTemplateKey.Notification, {
 						to: adminUser.email,
 						userId: adminUser.id,
 						templateData: {
@@ -546,7 +542,7 @@ export const authRouter = createTRPCRouter({
 			const resetLink = `${process.env.NEXTAUTH_URL}/auth/forgotPassword/reset?token=${validationToken}`;
 			// Send email
 			try {
-				await sendMailWithTemplate(forgotPasswordTemplate, {
+				await sendMailWithTemplate(MailTemplateKey.ForgotPassword, {
 					to: email,
 					userId: user.id,
 					templateData: {
@@ -656,7 +652,7 @@ export const authRouter = createTRPCRouter({
 		const verifyLink = `${process.env.NEXTAUTH_URL}/auth/verifyEmail?token=${validationToken}`;
 		// Send email
 		try {
-			await sendMailWithTemplate(verifyEmailTemplate, {
+			await sendMailWithTemplate(MailTemplateKey.VerifyEmail, {
 				to: user.email,
 				userId: user.id,
 				templateData: {
diff --git a/src/server/api/routers/mfaAuthRouter.ts b/src/server/api/routers/mfaAuthRouter.ts
index a051f28d..4649613d 100644
--- a/src/server/api/routers/mfaAuthRouter.ts
+++ b/src/server/api/routers/mfaAuthRouter.ts
@@ -6,12 +6,13 @@ import {
 } from "~/server/api/trpc";
 import { throwError } from "~/server/helpers/errorHandler";
 import jwt from "jsonwebtoken";
-import { forgotPasswordTemplate, sendMailWithTemplate } from "~/utils/mail";
+import { sendMailWithTemplate } from "~/utils/mail";
 import { TOTP_MFA_TOKEN_SECRET, generateInstanceSecret } from "~/utils/encryption";
 import { ErrorCode } from "~/utils/errorCode";
 import rateLimit from "~/utils/rateLimit";
 import { TRPCError } from "@trpc/server";
 import bcrypt from "bcryptjs";
+import { MailTemplateKey } from "~/utils/enums";
 
 // allow 15 requests per 10 minutes
 const limiter = rateLimit({
@@ -126,7 +127,7 @@ export const mfaAuthRouter = createTRPCRouter({
 
 			// Send email
 			try {
-				await sendMailWithTemplate(forgotPasswordTemplate, {
+				await sendMailWithTemplate(MailTemplateKey.ForgotPassword, {
 					to: email,
 					templateData: {
 						toEmail: email,
diff --git a/src/server/api/routers/networkRouter.ts b/src/server/api/routers/networkRouter.ts
index ab27aacd..cd004e19 100644
--- a/src/server/api/routers/networkRouter.ts
+++ b/src/server/api/routers/networkRouter.ts
@@ -4,7 +4,7 @@ import { IPv4gen, getNetworkClassCIDR } from "~/utils/IPv4gen";
 import * as ztController from "~/utils/ztApi";
 import RuleCompiler from "~/utils/rule-compiler";
 import { throwError, type APIError } from "~/server/helpers/errorHandler";
-import { inviteUserTemplate, sendMailWithTemplate } from "~/utils/mail";
+import { sendMailWithTemplate } from "~/utils/mail";
 import { type TagsByName, type NetworkEntity, RoutesEntity } from "~/types/local/network";
 import { MemberEntity, type CapabilitiesByName } from "~/types/local/member";
 import { type CentralNetwork } from "~/types/central/network";
@@ -16,6 +16,7 @@ import { fetchZombieMembers, syncMemberPeersAndStatus } from "../services/member
 import { isValidCIDR, isValidDns, isValidIP } from "../utils/ipUtils";
 import { networkProvisioningFactory } from "../services/networkService";
 import { Address4, Address6 } from "ip-address";
+import { MailTemplateKey } from "~/utils/enums";
 
 const RouteSchema = z.object({
 	target: z
@@ -1348,7 +1349,7 @@ accept;`;
 			}
 			const { nwid, email } = input;
 			try {
-				await sendMailWithTemplate(inviteUserTemplate, {
+				await sendMailWithTemplate(MailTemplateKey.InviteUser, {
 					to: email,
 					templateData: {
 						toEmail: email,
diff --git a/src/server/api/routers/organizationRouter.ts b/src/server/api/routers/organizationRouter.ts
index 33808fb4..27bf76ae 100644
--- a/src/server/api/routers/organizationRouter.ts
+++ b/src/server/api/routers/organizationRouter.ts
@@ -15,7 +15,7 @@ import {
 	encrypt,
 	generateInstanceSecret,
 } from "~/utils/encryption";
-import { inviteOrganizationTemplate, sendMailWithTemplate } from "~/utils/mail";
+import { sendMailWithTemplate } from "~/utils/mail";
 import { Role } from "@prisma/client";
 import { checkUserOrganizationRole } from "~/utils/role";
 import { HookType, NetworkCreated, OrgMemberRemoved } from "~/types/webhooks";
@@ -24,6 +24,7 @@ import { sendWebhook } from "~/utils/webhook";
 import { nameGeneratorConfig } from "../services/networkService";
 import rateLimit from "~/utils/rateLimit";
 import { RoutesEntity } from "~/types/local/network";
+import { MailTemplateKey } from "~/utils/enums";
 
 // Create a Zod schema for the HookType enum
 const HookTypeEnum = z.enum(Object.values(HookType) as [HookType, ...HookType[]]);
@@ -1071,7 +1072,7 @@ export const organizationRouter = createTRPCRouter({
 				}
 
 				// Send email
-				await sendMailWithTemplate(inviteOrganizationTemplate, {
+				await sendMailWithTemplate(MailTemplateKey.InviteOrganization, {
 					to: orgInvite.invitation.email,
 					userId: ctx.session.user.id,
 					templateData: {
@@ -1204,7 +1205,7 @@ export const organizationRouter = createTRPCRouter({
 				});
 
 				// Send invitation email
-				await sendMailWithTemplate(inviteOrganizationTemplate, {
+				await sendMailWithTemplate(MailTemplateKey.InviteOrganization, {
 					to: email,
 					userId: ctx.session.user.id,
 					templateData: {
diff --git a/src/server/callbacks/signin.ts b/src/server/callbacks/signin.ts
index 5e41ef03..4812a88c 100644
--- a/src/server/callbacks/signin.ts
+++ b/src/server/callbacks/signin.ts
@@ -4,11 +4,8 @@ import { generateDeviceId, parseUA } from "~/utils/devices";
 import { isRunningInDocker } from "~/utils/docker";
 import { IncomingMessage } from "http";
 import { User } from "@prisma/client";
-import {
-	newDeviceNotificationTemplate,
-	deviceIpChangeNotificationTemplate,
-	sendMailWithTemplate,
-} from "~/utils/mail";
+import { sendMailWithTemplate } from "~/utils/mail";
+import { MailTemplateKey } from "~/utils/enums";
 
 interface DeviceInfo {
 	userAgent: string;
@@ -92,7 +89,7 @@ async function upsertDeviceInfo(deviceInfo: DeviceInfo): Promise<void> {
 	if (user && !user.firstTime) {
 		try {
 			if (hasIpAddressChanged && hasDevice) {
-				sendMailWithTemplate(deviceIpChangeNotificationTemplate, {
+				sendMailWithTemplate(MailTemplateKey.DeviceIpChangeNotification, {
 					to: user.email,
 					userId: user.id,
 					templateData: {
@@ -105,7 +102,7 @@ async function upsertDeviceInfo(deviceInfo: DeviceInfo): Promise<void> {
 				});
 			} else if (!hasDevice) {
 				// Send email about new device
-				sendMailWithTemplate(newDeviceNotificationTemplate, {
+				sendMailWithTemplate(MailTemplateKey.NewDeviceNotification, {
 					to: user.email,
 					userId: user.id,
 					templateData: {
diff --git a/src/utils/enums.ts b/src/utils/enums.ts
new file mode 100644
index 00000000..4eac126a
--- /dev/null
+++ b/src/utils/enums.ts
@@ -0,0 +1,11 @@
+// Extracted mail enums as it caused issues if imported directly from mail.ts
+export enum MailTemplateKey {
+	InviteUser = "inviteUserTemplate",
+	InviteAdmin = "inviteAdminTemplate",
+	InviteOrganization = "inviteOrganizationTemplate",
+	ForgotPassword = "forgotPasswordTemplate",
+	VerifyEmail = "verifyEmailTemplate",
+	Notification = "notificationTemplate",
+	NewDeviceNotification = "newDeviceNotificationTemplate",
+	DeviceIpChangeNotification = "deviceIpChangeNotificationTemplate",
+}
diff --git a/src/utils/mail.ts b/src/utils/mail.ts
index 99f53c3f..bcf27d79 100644
--- a/src/utils/mail.ts
+++ b/src/utils/mail.ts
@@ -4,6 +4,7 @@ import { SMTP_SECRET, decrypt, generateInstanceSecret } from "./encryption";
 import { prisma } from "~/server/db";
 import ejs from "ejs";
 import { GlobalOptions, UserOptions } from "@prisma/client";
+import { MailTemplateKey } from "./enums";
 
 export const inviteOrganizationTemplate = () => {
 	return {
@@ -118,7 +119,7 @@ export const mailTemplateMap = {
 	inviteOrganizationTemplate,
 	newDeviceNotificationTemplate,
 	deviceIpChangeNotificationTemplate,
-};
+} as const;
 
 const templateToOptionMap: Record<string, string> = {
 	newDeviceNotificationTemplate: "newDeviceNotification",
@@ -130,25 +131,14 @@ interface EmailTemplate {
 	body: string;
 }
 
-/**
- * Represents the options for sending an email.
- */
 interface EmailOptions {
 	to: string;
 	templateData: Record<string, unknown>;
 	userId?: string;
 }
 
-/**
- * Sends an email with a template.
- *
- * @param templateFunc - The function that returns the email template.
- * @param options - The options for sending the email.
- * @returns A promise that resolves when the email is sent successfully.
- * @throws An error if global options or user options are not found.
- */
 export async function sendMailWithTemplate(
-	templateFunc: () => EmailTemplate,
+	templateKey: MailTemplateKey,
 	options: EmailOptions,
 ) {
 	const globalOptions = await prisma.globalOptions.findFirst({
@@ -160,10 +150,10 @@ export async function sendMailWithTemplate(
 	}
 
 	if (options.userId) {
-		await checkUserPreferences(options.userId, templateFunc.name);
+		await checkUserPreferences(options.userId, templateKey);
 	}
 
-	const template = await getTemplate(globalOptions, templateFunc);
+	const template = await getTemplate(globalOptions, templateKey);
 
 	const renderedTemplate = await renderTemplate(template, options.templateData);
 
@@ -181,13 +171,16 @@ export async function sendMailWithTemplate(
 	await sendEmail(transporter, mailOptions);
 }
 
-async function checkUserPreferences(userId: string, templateName: string): Promise<void> {
+async function checkUserPreferences(
+	userId: string,
+	templateKey: MailTemplateKey,
+): Promise<void> {
 	const userOptions = await prisma.userOptions.findUnique({ where: { userId } });
 	if (!userOptions) {
 		throw new Error("User options not found");
 	}
 
-	const optionField = templateToOptionMap[templateName];
+	const optionField = templateToOptionMap[templateKey];
 	if (optionField && !(userOptions as UserOptions)[optionField]) {
 		throw new Error(`User has disabled ${optionField} notifications`);
 	}
@@ -195,39 +188,31 @@ async function checkUserPreferences(userId: string, templateName: string): Promi
 
 async function getTemplate(
 	globalOptions: GlobalOptions,
-	templateFunc: () => EmailTemplate,
+	templateKey: MailTemplateKey,
 ): Promise<EmailTemplate> {
-	const defaultTemplate = templateFunc();
-	const templateName = templateFunc.name;
-
-	// biome-ignore lint/suspicious/noConsoleLog: <explanation>
-	console.log(`Attempting to retrieve template: ${templateName}`);
-	// biome-ignore lint/suspicious/noConsoleLog: <explanation>
-	console.log("Global options:", JSON.stringify(globalOptions, null, 2));
+	const defaultTemplate = mailTemplateMap[templateKey]();
 
-	if (!(templateName in globalOptions)) {
+	if (!(templateKey in globalOptions)) {
 		console.warn(
-			`Template '${templateName}' not found in global options. Using default template.`,
+			`Template '${templateKey}' not found in global options. Using default template.`,
 		);
 		return defaultTemplate;
 	}
 
-	const storedTemplate = globalOptions[templateName];
+	const storedTemplate = globalOptions[templateKey];
 
 	if (typeof storedTemplate !== "string") {
 		console.warn(
-			`Template '${templateName}' is not a string. Type: ${typeof storedTemplate}. Using default template.`,
+			`Template '${templateKey}' is not a string. Type: ${typeof storedTemplate}. Using default template.`,
 		);
 		return defaultTemplate;
 	}
 
 	try {
 		const parsedTemplate = JSON.parse(storedTemplate);
-		// biome-ignore lint/suspicious/noConsoleLog: <explanation>
-		console.log(`Successfully parsed template: ${templateName}`);
 		return parsedTemplate;
 	} catch (error) {
-		console.error(`Failed to parse template '${templateName}':`, error);
+		console.error(`Failed to parse template '${templateKey}':`, error);
 		console.error("Template content:", storedTemplate);
 		return defaultTemplate;
 	}
@@ -253,6 +238,7 @@ function parseRenderedTemplate(renderedTemplate: string): EmailTemplate {
 		throw new Error("Failed to parse rendered template");
 	}
 }
+
 interface SendMailResult {
 	accepted: string[];
 }