diff --git a/cli/command/registry.go b/cli/command/registry.go
index 39e2e0ddb1..177c03cbb5 100644
--- a/cli/command/registry.go
+++ b/cli/command/registry.go
@@ -157,6 +157,7 @@ func PromptUserForCredentials(ctx context.Context, cli Cli, argUser, argPassword
 		}
 	}
 
+	argPassword = strings.TrimSpace(argPassword)
 	if argPassword == "" {
 		restoreInput, err := DisableInputEcho(cli.In())
 		if err != nil {