diff --git a/backend/src/server/routes/v3/login-router.ts b/backend/src/server/routes/v3/login-router.ts
index dfacae8a8..b5f523a54 100644
--- a/backend/src/server/routes/v3/login-router.ts
+++ b/backend/src/server/routes/v3/login-router.ts
@@ -43,7 +43,7 @@ export const registerLoginRouter = async (server: FastifyZodProvider) => {
     schema: {
       body: z.object({
         organizationId: z.string().trim(),
-        customUserAgent: z.enum(["cli"]).optional()
+        userAgent: z.enum(["cli"]).optional()
       }),
       response: {
         200: z.object({
@@ -54,7 +54,7 @@ export const registerLoginRouter = async (server: FastifyZodProvider) => {
     handler: async (req, res) => {
       const cfg = getConfig();
       const tokens = await server.services.login.selectOrganization({
-        userAgent: req.body.customUserAgent ?? req.headers["user-agent"],
+        userAgent: req.body.userAgent ?? req.headers["user-agent"],
         authJwtToken: req.headers.authorization,
         organizationId: req.body.organizationId,
         ipAddress: req.realIp
diff --git a/frontend/src/hooks/api/auth/queries.tsx b/frontend/src/hooks/api/auth/queries.tsx
index 411aebae8..27c7c87d2 100644
--- a/frontend/src/hooks/api/auth/queries.tsx
+++ b/frontend/src/hooks/api/auth/queries.tsx
@@ -24,6 +24,7 @@ import {
   SRP1DTO,
   SRPR1Res,
   TOauthTokenExchangeDTO,
+  UserAgentType,
   VerifyMfaTokenDTO,
   VerifyMfaTokenRes,
   VerifySignupInviteDTO
@@ -62,7 +63,7 @@ export const useLogin1 = () => {
 
 export const selectOrganization = async (data: {
   organizationId: string;
-  customUserAgent?: string;
+  userAgent?: UserAgentType;
 }) => {
   const { data: res } = await apiRequest.post<{ token: string }>(
     "/api/v3/auth/select-organization",
@@ -74,11 +75,11 @@ export const selectOrganization = async (data: {
 export const useSelectOrganization = () => {
   const queryClient = useQueryClient();
   return useMutation({
-    mutationFn: async (details: { organizationId: string; customUserAgent?: string }) => {
+    mutationFn: async (details: { organizationId: string; userAgent?: UserAgentType }) => {
       const data = await selectOrganization(details);
 
       // If a custom user agent is set, then this session is meant for another consuming application, not the web application.
-      if (!details.customUserAgent) {
+      if (!details.userAgent) {
         SecurityClient.setToken(data.token);
         SecurityClient.setProviderAuthToken("");
       }
diff --git a/frontend/src/hooks/api/auth/types.ts b/frontend/src/hooks/api/auth/types.ts
index 3664e8e96..f51f7b091 100644
--- a/frontend/src/hooks/api/auth/types.ts
+++ b/frontend/src/hooks/api/auth/types.ts
@@ -145,3 +145,7 @@ export type IssueBackupPrivateKeyDTO = {
 export type GetBackupEncryptedPrivateKeyDTO = {
   verificationToken: string;
 };
+
+export enum UserAgentType {
+  CLI = "cli"
+}
diff --git a/frontend/src/pages/login/select-organization.tsx b/frontend/src/pages/login/select-organization.tsx
index 32081af9f..13ec3e414 100644
--- a/frontend/src/pages/login/select-organization.tsx
+++ b/frontend/src/pages/login/select-organization.tsx
@@ -16,6 +16,7 @@ import { Button, Spinner } from "@app/components/v2";
 import { SessionStorageKeys } from "@app/const";
 import { useUser } from "@app/context";
 import { useGetOrganizations, useLogoutUser, useSelectOrganization } from "@app/hooks/api";
+import { UserAgentType } from "@app/hooks/api/auth/types";
 import { Organization } from "@app/hooks/api/types";
 import { getAuthToken, isLoggedIn } from "@app/reactQuery";
 import { navigateUserToOrg } from "@app/views/Login/Login.utils";
@@ -70,7 +71,7 @@ export default function LoginPage() {
 
       const { token } = await selectOrg.mutateAsync({
         organizationId: organization.id,
-        customUserAgent: callbackPort ? "cli" : undefined
+        userAgent: callbackPort ? UserAgentType.CLI : undefined
       });
 
       if (callbackPort) {