diff --git a/apps/client/src/components/admin/manage/cad-settings/misc-features/template-tab.tsx b/apps/client/src/components/admin/manage/cad-settings/misc-features/template-tab.tsx
index d8b249d94..51e71e8de 100644
--- a/apps/client/src/components/admin/manage/cad-settings/misc-features/template-tab.tsx
+++ b/apps/client/src/components/admin/manage/cad-settings/misc-features/template-tab.tsx
@@ -13,7 +13,7 @@ import type { MiscCadSettings } from "@snailycad/types";
 
 export const CALLSIGN_TEMPLATE_VARIABLES = (
   <span key="CALLSIGN_TEMPLATE_VARIABLES">
-    <code>{"{department}"}</code>,<code>{"{division}"}</code>, <code>{"{callsign}"}</code>,{" "}
+    <code>{"{department}"}</code>,<code>{"{division}"}</code>, <code>{"{callsign1}"}</code>,{" "}
     <code>{"{callsign2}"}</code>
   </span>
 );
diff --git a/packages/utils/src/callsign.ts b/packages/utils/src/callsign.ts
index af8a46d63..63ca664c9 100644
--- a/packages/utils/src/callsign.ts
+++ b/packages/utils/src/callsign.ts
@@ -38,6 +38,7 @@ export function generateCallsign(unit: Unit, template: string | null) {
 
   const replacers = {
     department: unit.department?.callsign,
+    callsign: unit.callsign,
     callsign1: unit.callsign,
     callsign2: unit.callsign2,
     division: division?.callsign,