diff --git a/cmd/enbas-cli-generators/templates.go b/cmd/enbas-cli-generators/templates.go
index d0e62b1..5e5de2b 100644
--- a/cmd/enbas-cli-generators/templates.go
+++ b/cmd/enbas-cli-generators/templates.go
@@ -39,7 +39,7 @@ func {{ $new_executor_function_name }}(
 		{{- end }}
 	}
 	{{ print "" }}
-	exe.Usage = commandUsageFunc({{ printf "%q" $name }}, {{ printf "%q" $command.Summary }}, showExe.FlagSet)
+	exe.Usage = commandUsageFunc({{ printf "%q" $name }}, {{ printf "%q" $command.Summary }}, exe.FlagSet)
 	{{ print "" }}
 	{{- range $flag := $command.Flags -}}
 	{{- if eq (getFlagType $flag.Flag) "string" -}}
diff --git a/schema/enbas_cli_schema.json b/schema/enbas_cli_schema.json
index fb50881..e169bd3 100644
--- a/schema/enbas_cli_schema.json
+++ b/schema/enbas_cli_schema.json
@@ -26,6 +26,12 @@
       "flags": [
         { "flag": "full", "default": "false" }
       ]
+    },
+    "whoami": {
+      "usePrinter": true,
+      "useConfig": true,
+      "summary": "Prints the account that you are currently logged into",
+      "flags": []
     }
   }
 }