diff --git a/cmd/i2p.plugin.native/main.go b/cmd/i2p.plugin.native/main.go
index 07ef2c5..0d95e6f 100644
--- a/cmd/i2p.plugin.native/main.go
+++ b/cmd/i2p.plugin.native/main.go
@@ -92,13 +92,13 @@ func main() {
 		log.Fatal(err)
 	}
 
-	if *cc.Executable != "" {
+	if *cc.Executable != "" && *cc.ClientName == "" {
 		*cc.ClientName = *cc.Executable
 	}
 
 	cc.CheckClientName(*pc.PluginName)
 
-	if *cc.Executable == "" {
+	if *cc.Executable == "" && *cc.ClientName != "" {
 		*cc.Executable = *cc.ClientName
 	}