diff --git a/src/cmd/linuxkit/pkglib/pkglib.go b/src/cmd/linuxkit/pkglib/pkglib.go
index d49fb371a..9708710a2 100644
--- a/src/cmd/linuxkit/pkglib/pkglib.go
+++ b/src/cmd/linuxkit/pkglib/pkglib.go
@@ -92,16 +92,6 @@ func NewFromCLI(fs *flag.FlagSet, args ...string) (Pkg, error) {
 		return Pkg{}, err
 	}
 
-	if devMode {
-		// If --org is also used then this will be overwritten
-		// by argOrg when we iterate over the provided options
-		// in the fs.Visit block below.
-		pi.Org = os.Getenv("USER")
-		if hash == "" {
-			hash = "dev"
-		}
-	}
-
 	if hashPath == "" {
 		hashPath = pkgPath
 	} else {
@@ -129,6 +119,16 @@ func NewFromCLI(fs *flag.FlagSet, args ...string) (Pkg, error) {
 		return Pkg{}, fmt.Errorf("Image field is required")
 	}
 
+	if devMode {
+		// If --org is also used then this will be overwritten
+		// by argOrg when we iterate over the provided options
+		// in the fs.Visit block below.
+		pi.Org = os.Getenv("USER")
+		if hash == "" {
+			hash = "dev"
+		}
+	}
+
 	// Go's flag package provides no way to see if a flag was set
 	// apart from Visit which iterates over only those which were
 	// set.