diff --git a/client/v2/autocli/flag/enum.go b/client/v2/autocli/flag/enum.go
index 72b27528a9..db3f576275 100644
--- a/client/v2/autocli/flag/enum.go
+++ b/client/v2/autocli/flag/enum.go
@@ -58,7 +58,12 @@ func (e enumValue) String() string {
 func (e *enumValue) Set(s string) error {
 	valDesc, ok := e.valMap[s]
 	if !ok {
-		return fmt.Errorf("%s is not a valid value for enum %s", s, e.enum.FullName())
+		var validValues []string
+		for k := range e.valMap {
+			validValues = append(validValues, k)
+		}
+
+		return fmt.Errorf("%s is not a valid value for enum %s. Valid values are: %s", s, e.enum.FullName(), strings.Join(validValues, ", "))
 	}
 	e.value = valDesc.Number()
 	return nil