diff --git a/command/context/current.go b/command/context/current.go
index 7a381ede..96c41fb7 100644
--- a/command/context/current.go
+++ b/command/context/current.go
@@ -47,7 +47,7 @@ func currentAction(ctx *cli.Context) error {
 		return errors.New("no context selected")
 	}
 
-	if ctx.Bool("verbose") {
+	if ctx.Bool("json") {
 		b, err := json.Marshal(struct {
 			Name      string `json:"name"`
 			Authority string `json:"authority"`
diff --git a/command/ssh/hosts.go b/command/ssh/hosts.go
index 381acbdd..68127d2b 100644
--- a/command/ssh/hosts.go
+++ b/command/ssh/hosts.go
@@ -19,8 +19,8 @@ func hostsCommand() cli.Command {
 		Action: command.ActionFunc(hostsAction),
 		Usage:  "returns a list of all valid hosts",
 		UsageText: `**step ssh hosts** [**--set**=<key=value>] [**--set-file**=<file>]
-[**--offline**] [**--ca-config**=<file>]
-[**--ca-url**=<uri>] [**--root**=<file>] [**--context**=<string>]`,
+[**--offline**] [**--ca-config**=<file>] [**--ca-url**=<uri>] [**--root**=<file>]
+[**--context**=<name>]`,
 		Description: `**step ssh hosts** returns a list of valid hosts for SSH.
 
 This command returns a zero exit status then the server exists, it will return 1