diff --git a/pkg/client/config.go b/pkg/client/config.go
index 1660cc602..502214862 100644
--- a/pkg/client/config.go
+++ b/pkg/client/config.go
@@ -194,16 +194,14 @@ func printConfigChangeHelp(conf jsonconfig.Obj) {
 	oldConfig := false
 	configChangedMsg := fmt.Sprintf("The client configuration file (%s) keys have changed.\n", osutil.UserClientConfigPath())
 	for _, unknown := range conf.UnknownKeys() {
-		for k, v := range rename {
-			if unknown == k {
-				if v != "" {
-					configChangedMsg += fmt.Sprintf("%q should be renamed %q.\n", k, v)
-				} else {
-					configChangedMsg += fmt.Sprintf("%q should be removed.\n", k)
-				}
-				oldConfig = true
-				break
+		v, ok := rename[unknown]
+		if ok {
+			if v != "" {
+				configChangedMsg += fmt.Sprintf("%q should be renamed %q.\n", unknown, v)
+			} else {
+				configChangedMsg += fmt.Sprintf("%q should be removed.\n", unknown)
 			}
+			oldConfig = true
 		}
 	}
 	if oldConfig {