diff --git a/controllers/common.go b/controllers/common.go
index ffa830c6..a062f599 100644
--- a/controllers/common.go
+++ b/controllers/common.go
@@ -204,7 +204,7 @@ func UpdateNode(nodechange models.Node, node models.Node) (models.Node, error) {
                         {"expdatetime", node.ExpirationDateTime},
                         {"endpoint", node.Endpoint},
                         {"postup", node.PostUp},
-                        {"preup", node.PostDown},
+                        {"postdown", node.PostDown},
                         {"macaddress", node.MacAddress},
                         {"localaddress", node.LocalAddress},
                         {"persistentkeepalive", node.PersistentKeepalive},
diff --git a/controllers/networkHttpController.go b/controllers/networkHttpController.go
index fa470ad0..6f36ea33 100644
--- a/controllers/networkHttpController.go
+++ b/controllers/networkHttpController.go
@@ -225,7 +225,7 @@ func keyUpdate(w http.ResponseWriter, r *http.Request) {
                         {"displayname", network.DisplayName},
                         {"defaultlistenport", network.DefaultListenPort},
                         {"defaultpostup", network.DefaultPostUp},
-                        {"defaultpreup", network.DefaultPostDown},
+                        {"defaultpostdown", network.DefaultPostDown},
 			{"defaultkeepalive", network.DefaultKeepalive},
                         {"keyupdatetimestamp", network.KeyUpdateTimeStamp},
                         {"defaultsaveconfig", network.DefaultSaveConfig},
@@ -395,7 +395,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
                         {"displayname", network.DisplayName},
                         {"defaultlistenport", network.DefaultListenPort},
                         {"defaultpostup", network.DefaultPostUp},
-                        {"defaultpreup", network.DefaultPostDown},
+                        {"defaultpostdown", network.DefaultPostDown},
                         {"defaultkeepalive", network.DefaultKeepalive},
                         {"defaultsaveconfig", network.DefaultSaveConfig},
                         {"defaultinterface", network.DefaultInterface},
diff --git a/controllers/nodeHttpController.go b/controllers/nodeHttpController.go
index dfc6a33c..1152afd9 100644
--- a/controllers/nodeHttpController.go
+++ b/controllers/nodeHttpController.go
@@ -686,7 +686,7 @@ func deleteGateway(w http.ResponseWriter, r *http.Request) {
         update := bson.D{
                 {"$set", bson.D{
                         {"postup", nodechange.PostUp},
-                        {"preup", nodechange.PostDown},
+                        {"postdown", nodechange.PostDown},
                         {"isgateway", nodechange.IsGateway},
                         {"gatewayrange", nodechange.GatewayRange},
                         {"lastmodified", nodechange.LastModified},
@@ -703,7 +703,7 @@ func deleteGateway(w http.ResponseWriter, r *http.Request) {
                 return
         }
 
-        err = SetNetworkNodesLastModified(params["networkname"])
+        err = SetNetworkNodesLastModified(params["network"])
         if err != nil {
                 returnErrorResponse(w,r,formatError(err, "internal"))
                 return
diff --git a/models/network.go b/models/network.go
index 1a461e42..4183f9ba 100644
--- a/models/network.go
+++ b/models/network.go
@@ -18,7 +18,7 @@ type Network struct {
 	DefaultInterface	string `json:"defaultinterface" bson:"defaultinterface"`
         DefaultListenPort      int32 `json:"defaultlistenport,omitempty" bson:"defaultlistenport,omitempty" validate:"omitempty,numeric,min=1024,max=65535"`
         DefaultPostUp  string `json:"defaultpostup" bson:"defaultpostup"`
-        DefaultPostDown   string `json:"defaultpreup" bson:"defaultpreup"`
+        DefaultPostDown   string `json:"defaultpostdown" bson:"defaultpostdown"`
         KeyUpdateTimeStamp      int64 `json:"keyupdatetimestamp" bson:"keyupdatetimestamp"`
         DefaultKeepalive int32 `json:"defaultkeepalive" bson:"defaultkeepalive" validate: "omitempty,numeric,max=1000"`
         DefaultSaveConfig      *bool `json:"defaultsaveconfig" bson:"defaultsaveconfig"`
diff --git a/models/returnNode.go b/models/returnNode.go
index 2061605c..df87c5ea 100644
--- a/models/returnNode.go
+++ b/models/returnNode.go
@@ -12,7 +12,7 @@ type ReturnNode struct {
 	PublicKey	string `json:"publickey" bson:"publickey" validate:"base64"`
 	Endpoint	string `json:"endpoint" bson:"endpoint" validate:"required,ipv4"`
 	PostUp	string `json:"postup" bson:"postup"`
-	PostDown	string `json:"preup" bson:"preup"`
+	PostDown	string `json:"postdown" bson:"postdown"`
 	PersistentKeepalive int32 `json:"persistentkeepalive" bson:"persistentkeepalive"`
 	SaveConfig	*bool `json:"saveconfig" bson:"saveconfig"`
 	Interface	string `json:"interface" bson:"interface"`
diff --git a/netclient/functions/common.go b/netclient/functions/common.go
index 24b57720..70783809 100644
--- a/netclient/functions/common.go
+++ b/netclient/functions/common.go
@@ -1090,8 +1090,11 @@ func CheckIn(network string) error {
                         if err != nil {
                                 fmt.Println("ERROR DELETING INTERFACE: " + currentiface)
                         }
-                }
                 err = setWGConfig(network)
+                if err != nil {
+                        log.Printf("Error updating interface: %v", err)
+                }
+		}
 		}
 
 	if checkinres.Checkinresponse.Needconfigupdate {