diff --git a/netclient/functions/checkin.go b/netclient/functions/checkin.go
index 01db9ffa..deea4d59 100644
--- a/netclient/functions/checkin.go
+++ b/netclient/functions/checkin.go
@@ -98,11 +98,6 @@ func checkNodeActions(node *models.Node, network string, servercfg config.Server
 			log.Println("Unable to process reset keys request:", err)
 			return ""
 		}
-		node.Action = models.NODE_NOOP
-		if err = config.ModConfig(node); err != nil {
-			return ""
-		}
-		Push(network)
 		return ""
 	}
 	if node.Action == models.NODE_DELETE {
@@ -127,12 +122,10 @@ func checkNodeActions(node *models.Node, network string, servercfg config.Server
 func CheckConfig(cliconf config.ClientConfig) error {
 
 	network := cliconf.Network
-	// node := server.GetNode(network)
 	cfg, err := config.ReadConfig(network)
 	if err != nil {
 		return err
 	}
-	// nodecfg := cfg.Node
 	servercfg := cfg.Server
 
 	newNode, err := Pull(network, false)
@@ -231,6 +224,10 @@ func Pull(network string, manual bool) (*models.Node, error) {
 		if err != nil {
 			return &resNode, err
 		}
+	} else {
+		if err = wireguard.SetWGConfig(network, true); err != nil {
+			return nil, err
+		}
 	}
 	setDNS(&resNode, servercfg, &cfg.Node)
 
diff --git a/netclient/wireguard/kernel.go b/netclient/wireguard/kernel.go
index 4f8312ac..db269620 100644
--- a/netclient/wireguard/kernel.go
+++ b/netclient/wireguard/kernel.go
@@ -342,6 +342,9 @@ func SetWGKeyConfig(network string, serveraddr string) error {
 	if err != nil {
 		return err
 	}
+	if node.Action == models.NODE_UPDATE_KEY {
+		node.Action = models.NODE_NOOP
+	}
 	err = config.ModConfig(&node)
 	if err != nil {
 		return err