diff --git a/main.go b/main.go
index 8e109f8..d897b81 100644
--- a/main.go
+++ b/main.go
@@ -65,10 +65,13 @@ func main() {
 
 func run(c *cli.Context) error {
 	user := c.String("username")
-	pass := c.String("password")
+	if user == "" {
+		return errors.New("username required")
+	}
 
-	if user == "" || pass == "" {
-		return errors.New("username and password required")
+	pass := c.String("password")
+	if pass == "" {
+		return errors.New("password required")
 	}
 
 	reg, err := name.NewRegistry(c.String("registry"))