diff --git a/cli/main.go b/cli/main.go
index 3d0ced3279cf..000e1e9a4e63 100644
--- a/cli/main.go
+++ b/cli/main.go
@@ -36,9 +36,11 @@ func RunCustom(args []string, commands map[string]cli.CommandFactory) int {
 	}
 
 	cli := &cli.CLI{
-		Args:     args,
-		Commands: commands,
-		HelpFunc: cli.FilteredHelpFunc(commandsInclude, HelpFunc),
+		Args:         args,
+		Commands:     commands,
+		Name:         "vault",
+		Autocomplete: true,
+		HelpFunc:     cli.FilteredHelpFunc(commandsInclude, HelpFunc),
 	}
 
 	exitCode, err := cli.Run()