diff --git a/apps/cli/docs/supabase/login.md b/apps/cli/docs/supabase/login.md
index 66aef424d2..2087c813d4 100644
--- a/apps/cli/docs/supabase/login.md
+++ b/apps/cli/docs/supabase/login.md
@@ -1,6 +1,6 @@
 ## supabase-login
 
-Connect the Supabase CLI to your Supabase account by logging in with your [personal access token](https://supabase.com/dashboard/account/tokens).
+Connect the Supabase CLI to your Supabase account by signing in with your [personal access token](https://supabase.com/dashboard/account/tokens).
 
 Your access token is stored securely in native credentials storage (the operating system keyring). If native credentials storage is unavailable, it will be written to a plain text file at `<SUPABASE_HOME or ~/.supabase>/access-token`.
 
diff --git a/apps/cli/src/commands/orgs/create/create.command.ts b/apps/cli/src/commands/orgs/create/create.command.ts
index 36e6e9d70d..367e1129d3 100644
--- a/apps/cli/src/commands/orgs/create/create.command.ts
+++ b/apps/cli/src/commands/orgs/create/create.command.ts
@@ -16,7 +16,7 @@ const config = {
 export type OrgsCreateFlags = CliCommand.Command.Config.Infer<typeof config>;
 
 export const orgsCreateCommand = Command.make("create", config).pipe(
-  Command.withDescription("Create an organization for the logged-in user."),
+  Command.withDescription("Create an organization for the signed-in user."),
   Command.withShortDescription("Create an organization"),
   withPermissions({ operations: [{ operationId: "v1-create-an-organization", kind: "required" }] }),
   Command.withHandler((flags) =>
diff --git a/apps/cli/src/commands/orgs/list/list.command.ts b/apps/cli/src/commands/orgs/list/list.command.ts
index 333f89567a..7086d8724a 100644
--- a/apps/cli/src/commands/orgs/list/list.command.ts
+++ b/apps/cli/src/commands/orgs/list/list.command.ts
@@ -12,7 +12,7 @@ const config = {};
 export type OrgsListFlags = CliCommand.Command.Config.Infer<typeof config>;
 
 export const orgsListCommand = Command.make("list", config).pipe(
-  Command.withDescription("List all organizations the logged-in user belongs."),
+  Command.withDescription("List all organizations the signed-in user belongs to."),
   Command.withShortDescription("List all organizations"),
   withPermissions({ operations: [{ operationId: "v1-list-all-organizations", kind: "required" }] }),
   Command.withHandler((flags) =>
diff --git a/apps/cli/src/commands/projects/list/list.command.ts b/apps/cli/src/commands/projects/list/list.command.ts
index 570ee620f6..d014a519a6 100644
--- a/apps/cli/src/commands/projects/list/list.command.ts
+++ b/apps/cli/src/commands/projects/list/list.command.ts
@@ -14,7 +14,7 @@ const config = {};
 export type ProjectsListFlags = CliCommand.Command.Config.Infer<typeof config>;
 
 export const projectsListCommand = Command.make("list", config).pipe(
-  Command.withDescription("List all Supabase projects the logged-in user can access."),
+  Command.withDescription("List all Supabase projects the signed-in user can access."),
   Command.withShortDescription("List all projects"),
   Command.withExamples([
     {
diff --git a/apps/cli/src/commands/sso/remove/SIDE_EFFECTS.md b/apps/cli/src/commands/sso/remove/SIDE_EFFECTS.md
index c068876fb2..c2e93b12bc 100644
--- a/apps/cli/src/commands/sso/remove/SIDE_EFFECTS.md
+++ b/apps/cli/src/commands/sso/remove/SIDE_EFFECTS.md
@@ -79,6 +79,6 @@ Single `success` event with the removed provider's details as data.
 
 ## Notes
 
-- Removing a provider will prevent existing SSO users from logging in.
+- Removing a provider will prevent existing SSO users from signing in.
 - The `<provider-id>` argument must be a valid UUID; UUIDs are accepted case-insensitively.
 - Asks `Remove SSO provider <id> on <target>?` (default No) before the first write.
diff --git a/apps/cli/src/commands/sso/remove/remove.command.ts b/apps/cli/src/commands/sso/remove/remove.command.ts
index c51e096ca3..bcf5b64e32 100644
--- a/apps/cli/src/commands/sso/remove/remove.command.ts
+++ b/apps/cli/src/commands/sso/remove/remove.command.ts
@@ -24,7 +24,7 @@ export type SsoRemoveFlags = CliCommand.Command.Config.Infer<typeof config>;
 
 export const ssoRemoveCommand = Command.make("remove", config).pipe(
   Command.withDescription(
-    "Remove a connection to an already added SSO identity provider. Removing the provider will prevent existing users from logging in. Please treat this command with care.",
+    "Remove a connection to an already added SSO identity provider. Removing the provider will prevent existing users from signing in. Please treat this command with care.",
   ),
   Command.withShortDescription("Remove an existing SSO identity provider"),
   Command.withExamples([
diff --git a/apps/cli/src/commands/whoami/whoami.command.ts b/apps/cli/src/commands/whoami/whoami.command.ts
index b5e99db796..2b4d7c5f23 100644
--- a/apps/cli/src/commands/whoami/whoami.command.ts
+++ b/apps/cli/src/commands/whoami/whoami.command.ts
@@ -22,7 +22,7 @@ export const whoamiHandler = (flags: WhoamiFlags) =>
   );
 
 export const whoamiCommand = Command.make("whoami", config).pipe(
-  Command.withDescription("Show information about the currently logged-in user."),
+  Command.withDescription("Show information about the currently signed-in user."),
   Command.withShortDescription("Show the current user"),
   Command.withExamples([
     {
diff --git a/apps/cli/src/docs/docs-spec.unit.test.ts b/apps/cli/src/docs/docs-spec.unit.test.ts
index fec9900be1..4f909991f0 100644
--- a/apps/cli/src/docs/docs-spec.unit.test.ts
+++ b/apps/cli/src/docs/docs-spec.unit.test.ts
@@ -201,7 +201,7 @@ describe("buildDocsSpec", () => {
     expect(whoami?.tags).toEqual(["management-api"]);
     expect(whoami?.usage).toBe("supabase whoami [flags]");
     expect(whoami?.subcommands).toEqual([]);
-    expect(whoami?.description).toBe("Show information about the currently logged-in user.");
+    expect(whoami?.description).toBe("Show information about the currently signed-in user.");
   });
 
   it("renders link with its overlay description and flag display names", () => {