diff --git a/roar/cli/__init__.py b/roar/cli/__init__.py
index 8d5e66a2..45c2e4d1 100644
--- a/roar/cli/__init__.py
+++ b/roar/cli/__init__.py
@@ -197,6 +197,9 @@ def cli(ctx: click.Context) -> None:
     \b
     Setup and Configuration:
         roar config            View or set configuration
+
+    \b
+    Account:
         roar auth key          Show the SSH key used for GLaaS signup
     """
     ctx.ensure_object(dict)
diff --git a/roar/cli/command_registry.py b/roar/cli/command_registry.py
index 34340a53..9c2bb975 100644
--- a/roar/cli/command_registry.py
+++ b/roar/cli/command_registry.py
@@ -148,7 +148,7 @@ class CommandSpec:
         "roar.cli.commands.auth",
         "auth",
         "Manage GLaaS auth and SSH keys",
-        "Setup and Admin",
+        "GLaaS / TReqs Account",
     ),
     CommandSpec(
         "config",
diff --git a/tests/unit/test_cli_registry.py b/tests/unit/test_cli_registry.py
index c67ec6ad..090aa8a6 100644
--- a/tests/unit/test_cli_registry.py
+++ b/tests/unit/test_cli_registry.py
@@ -33,14 +33,21 @@ def test_help_groups_are_built_from_command_specs() -> None:
         "get",
         "label",
     )
+    assert help_groups["Setup and Admin"] == (
+        "config",
+        "env",
+        "tracer",
+        "telemetry",
+        "proxy",
+    )
     assert help_groups["GLaaS / TReqs Account"] == (
+        "auth",
         "login",
         "logout",
         "whoami",
         "scope",
         "workflow",
     )
-    assert "telemetry" in help_groups["Setup and Admin"]
 
 
 def test_help_does_not_list_composite_command() -> None:
@@ -70,6 +77,7 @@ def test_help_shows_account_commands_by_default() -> None:
     assert "Share and Publish:" in result.output
     assert "Setup and Admin:" in result.output
     assert "GLaaS / TReqs Account:" in result.output
+    assert "Manage GLaaS auth and SSH keys" in result.output
     assert "Store global GLaaS/TReqs auth state" in result.output
     assert "Show current GLaaS/TReqs login and repo binding" in result.output
     assert "projects" not in result.output
diff --git a/uv.lock b/uv.lock
index 325611c9..0177e4b2 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1429,7 +1429,7 @@ wheels = [
 
 [[package]]
 name = "roar-cli"
-version = "0.2.12"
+version = "0.3.0"
 source = { editable = "." }
 dependencies = [
     { name = "blake3" },