diff --git a/controllers/common.go b/controllers/common.go
index 938254b3..a39169d0 100644
--- a/controllers/common.go
+++ b/controllers/common.go
@@ -253,7 +253,9 @@ func CreateNode(node models.Node, networkName string) (models.Node, error) {
 			node.IsServer = "yes"
 		}
 	}
-
+	if servercfg.IsDNSMode() && node.DNSOn == ""{
+		node.DNSOn = "yes"
+	}
 	node.SetDefaults()
 	node.Address, err = functions.UniqueAddress(networkName)
 	if err != nil {
@@ -269,9 +271,6 @@ func CreateNode(node models.Node, networkName string) (models.Node, error) {
 		//returnErrorResponse(w, r, errorResponse)
 		return node, err
 	}
-	if servercfg.IsDNSMode() {
-		node.DNSOn = "yes"
-	}
 	err = node.Validate(false)
 	if err != nil {
 		return node, err
diff --git a/netclient/config/config.go b/netclient/config/config.go
index 34c1e828..5d5fbbce 100644
--- a/netclient/config/config.go
+++ b/netclient/config/config.go
@@ -282,7 +282,7 @@ func GetCLIConfig(c *cli.Context) (ClientConfig, string, error) {
 	cfg.Node.Address = c.String("address")
 	cfg.Node.Address6 = c.String("addressIPV6")
 	cfg.Node.Roaming = c.String("roaming")
-	cfg.Node.DNSOn = c.String("dns")
+	cfg.Node.DNSOn = c.String("dnson")
 	cfg.Node.IsLocal = c.String("islocal")
 	cfg.Node.IsDualStack = c.String("isdualstack")
 	cfg.Node.PostUp = c.String("postup")
diff --git a/netclient/functions/join.go b/netclient/functions/join.go
index 464653e4..9855c3fb 100644
--- a/netclient/functions/join.go
+++ b/netclient/functions/join.go
@@ -105,6 +105,7 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
 		LocalAddress:        cfg.Node.LocalAddress,
 		Interface:           cfg.Node.Interface,
 		PublicKey:           cfg.Node.PublicKey,
+		DNSOn:           	 cfg.Node.DNSOn,
 		Name:                cfg.Node.Name,
 		Endpoint:            cfg.Node.Endpoint,
 		SaveConfig:          cfg.Node.SaveConfig,
@@ -118,7 +119,6 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
 	if err != nil {
 		return err
 	}
-
 	// Create node on server
 	res, err := wcclient.CreateNode(
 		context.TODO(),
@@ -152,6 +152,7 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
 		}
 		node.Endpoint = node.LocalAddress
 	}
+
 	err = config.ModConfig(&node)
 	if err != nil {
 		return err