diff --git a/ciao-cli/identity.go b/ciao-cli/identity.go
index a25299975..b7f70456f 100644
--- a/ciao-cli/identity.go
+++ b/ciao-cli/identity.go
@@ -252,36 +252,27 @@ func getTenant(username string, password string, tenantID string) (string, strin
 		return "", "", err
 	}
 
-	if len(projects) == 0 {
+	if len(projects) <= 0 {
 		return "", tenantID, fmt.Errorf("No tenant name for %s", username)
 	}
 
-	if len(projects) > 1 {
-		if tenantID == "" {
-			fmt.Printf("Available projects for %s:\n", *identityUser)
-			for i, p := range projects {
-				fmt.Printf("\t Project[%d]: %s (%s)\n", i+1, p.Name, p.ID)
-			}
-			return "", "", fmt.Errorf("Please specify a project to use with -tenant-name or -tenant-id")
+	if tenantID == "" {
+		if len(projects) == 1 {
+			tenantName := projects[0].Name
+			tenantID = projects[0].ID
+			return tenantName, tenantID, nil
 		}
-
-		for _, p := range projects {
-			if p.ID != tenantID {
-				continue
-			}
-			return p.Name, tenantID, nil
+		fmt.Printf("Available projects for %s:\n", *identityUser)
+		for i, p := range projects {
+			fmt.Printf("\t Project[%d]: %s (%s)\n", i+1, p.Name, p.ID)
 		}
-		return "", tenantID, fmt.Errorf("No tenant name for %s", tenantID)
-	}
-
-	if tenantID != "" && projects[0].ID != tenantID {
-		return "", tenantID, fmt.Errorf("No tenant name for %s", tenantID)
+		return "", "", fmt.Errorf("Please specify a project to use with -tenant-name or -tenant-id")
 	}
 
-	tenantName := projects[0].Name
-	if tenantID == "" {
-		tenantID = projects[0].ID
+	for _, p := range projects {
+		if p.ID == tenantID {
+			return p.Name, tenantID, nil
+		}
 	}
-
-	return tenantName, tenantID, nil
+	return "", tenantID, fmt.Errorf("No tenant name for %s", tenantID)
 }