diff --git a/pkg/remote/conncontroller/conncontroller.go b/pkg/remote/conncontroller/conncontroller.go
index b8de2ced0..b03507e2e 100644
--- a/pkg/remote/conncontroller/conncontroller.go
+++ b/pkg/remote/conncontroller/conncontroller.go
@@ -584,7 +584,7 @@ func resolveSshConfigPatterns(configFiles []string) ([]string, error) {
 			for _, hostPattern := range host.Patterns {
 				hostPatternStr := hostPattern.String()
 				normalized := remote.NormalizeConfigPattern(hostPatternStr)
-				if (!strings.Contains(hostPatternStr, "*") && !strings.Contains(hostPatternStr, "?") && !strings.Contains(hostPatternStr, "!")) || alreadyUsed[normalized] {
+				if !strings.Contains(hostPatternStr, "*") && !strings.Contains(hostPatternStr, "?") && !strings.Contains(hostPatternStr, "!") && !alreadyUsed[normalized] {
 					discoveredPatterns = append(discoveredPatterns, normalized)
 					alreadyUsed[normalized] = true
 					break
diff --git a/pkg/remote/connutil.go b/pkg/remote/connutil.go
index 593cb8e0c..025b78622 100644
--- a/pkg/remote/connutil.go
+++ b/pkg/remote/connutil.go
@@ -342,6 +342,7 @@ func IsPowershell(shellPath string) bool {
 func NormalizeConfigPattern(pattern string) string {
 	userName, err := WaveSshConfigUserSettings().GetStrict(pattern, "User")
 	if err != nil {
+		log.Printf("warning: error parsing username of %s for conn dropdown: %v", pattern, err)
 		localUser, err := user.Current()
 		if err == nil {
 			userName = localUser.Username