diff --git a/src/components/adminPage/mail/mailOrganizationInviteTemplate.tsx b/src/components/adminPage/mail/mailOrganizationInviteTemplate.tsx
index 5b1aa21b..0b63b839 100644
--- a/src/components/adminPage/mail/mailOrganizationInviteTemplate.tsx
+++ b/src/components/adminPage/mail/mailOrganizationInviteTemplate.tsx
@@ -62,8 +62,8 @@ const OrganizationInviteTemplate = () => {
 	}, [defaultTemplates]);
 
 	useEffect(() => {
-		const notificationTemplate = mailTemplates as IMailTemplate;
-		setEmailTemplate(notificationTemplate);
+		const inviteOrganizationTemplate = mailTemplates as IMailTemplate;
+		setEmailTemplate(inviteOrganizationTemplate);
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [mailTemplates]);
 
@@ -97,7 +97,7 @@ const OrganizationInviteTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(stateTemplate),
-				type: "notificationTemplate",
+				type: "inviteOrganizationTemplate",
 			},
 			{
 				onSuccess: () => {
@@ -167,7 +167,7 @@ const OrganizationInviteTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "notificationTemplate",
+								template: "inviteOrganizationTemplate",
 							})
 						}
 					>
@@ -178,7 +178,7 @@ const OrganizationInviteTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "notificationTemplate" })}
+						onClick={() => sendTestMail({ type: "inviteOrganizationTemplate" })}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")
diff --git a/src/server/api/routers/adminRoute.ts b/src/server/api/routers/adminRoute.ts
index ca17ae9b..fa6efb68 100644
--- a/src/server/api/routers/adminRoute.ts
+++ b/src/server/api/routers/adminRoute.ts
@@ -471,8 +471,10 @@ export const adminRouter = createTRPCRouter({
 						toEmail: ctx.session.user.email,
 						toName: ctx.session.user.name,
 						fromName: ctx.session.user.name,
+						fromAdmin: ctx.session.user.name,
 						forgotLink: "https://example.com",
 						notificationMessage: "Test notification message",
+						fromOrganization: "Test Organization",
 						nwid: "123456789",
 					},
 					{ async: true },
@@ -517,6 +519,14 @@ export const adminRouter = createTRPCRouter({
 					await sendTemplateEmail(notifiyTemplate);
 					break;
 				}
+				case "inviteOrganizationTemplate": {
+					const defaultInviteOrganizationTemplate = inviteOrganizationTemplate();
+					const notifiyTemplate =
+						globalOptions?.inviteOrganizationTemplate ??
+						defaultInviteOrganizationTemplate;
+					await sendTemplateEmail(notifiyTemplate);
+					break;
+				}
 				default:
 					break;
 			}