diff --git a/logic/nodes.go b/logic/nodes.go
index 75e63036..0bed8b9d 100644
--- a/logic/nodes.go
+++ b/logic/nodes.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"log"
 	"sort"
 	"time"
 
@@ -397,6 +398,7 @@ func GetNodeByIDorMacAddress(uuid string, macaddress string, network string) (mo
 		logger.Log(2, "rewriting legacy node data; node now has id,", node.ID)
 		node.PullChanges = "yes"
 	}
+	log.Printf("Node is %v, Error is %v \n", node, err)
 	return node, err
 }
 
diff --git a/logic/server.go b/logic/server.go
index 26512d0f..a7aa277e 100644
--- a/logic/server.go
+++ b/logic/server.go
@@ -87,6 +87,8 @@ func ServerJoin(networkSettings *models.Network, serverID string) error {
 
 	node.Network = networkSettings.NetID
 
+	cleanupServerIfLegacy(node.MacAddress, network)
+
 	logger.Log(2, "adding a server instance on network", node.Network)
 	err = CreateNode(node)
 	if err != nil {