diff --git a/pkg/commands/run.go b/pkg/commands/run.go
index 37d531c45..795bf3e0d 100644
--- a/pkg/commands/run.go
+++ b/pkg/commands/run.go
@@ -130,7 +130,7 @@ func addDefaultHOME(u string, envs []string) ([]string, error) {
 	// If user is set to username, set value of HOME to /home/${user}
 	// Otherwise the user is set to uid and HOME is /
 	userObj, err := userLookup(u)
-	if err == nil {
+	if err != nil {
 		if uo, e := userLookupId(u); e == nil {
 			userObj = uo
 		} else {
diff --git a/pkg/commands/user_test.go b/pkg/commands/user_test.go
index 2b99b3505..99775b714 100644
--- a/pkg/commands/user_test.go
+++ b/pkg/commands/user_test.go
@@ -55,23 +55,23 @@ var userTests = []struct {
 		expectedUID: "fakeUser",
 	},
 	{
-		user:        "root:root",
+		user:        "root",
 		userObj:     &user.User{Uid: "root", Gid: "some"},
 		expectedUID: "root",
 	},
 	{
-		user:        "0:root",
+		user:        "0",
 		userObj:     &user.User{Uid: "0"},
 		expectedUID: "0",
 	},
 	{
-		user:        "root:0",
+		user:        "root",
 		userObj:     &user.User{Uid: "root"},
 		expectedUID: "root",
 		expectedGID: "f0",
 	},
 	{
-		user:        "0:0",
+		user:        "0",
 		userObj:     &user.User{Uid: "0"},
 		expectedUID: "0",
 	},
@@ -81,12 +81,12 @@ var userTests = []struct {
 		expectedUID: "root",
 	},
 	{
-		user:        "root:$envgroup",
+		user:        "root",
 		userObj:     &user.User{Uid: "root"},
 		expectedUID: "root",
 	},
 	{
-		user:        "some:grp",
+		user:        "some",
 		userObj:     &user.User{Uid: "some"},
 		expectedUID: "some",
 	},