diff --git a/logic/gateway.go b/logic/gateway.go
index 7a1710c9..61076f24 100644
--- a/logic/gateway.go
+++ b/logic/gateway.go
@@ -44,10 +44,7 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro
 			postDownCmd = node.PostDown + "; " + postDownCmd
 		}
 	}
-	key, err := GetRecordKey(gateway.NodeID, gateway.NetID)
-	if err != nil {
-		return node, err
-	}
+
 	node.PostUp = postUpCmd
 	node.PostDown = postDownCmd
 	node.SetLastModified()
@@ -56,7 +53,7 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro
 	if err != nil {
 		return node, err
 	}
-	if err = database.Insert(key, string(nodeData), database.NODES_TABLE_NAME); err != nil {
+	if err = database.Insert(node.ID, string(nodeData), database.NODES_TABLE_NAME); err != nil {
 		return models.Node{}, err
 	}
 	if err = NetworkNodesUpdatePullChanges(node.Network); err != nil {
@@ -65,6 +62,7 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro
 	return node, nil
 }
 
+// ValidateEgressGateway - validates the egress gateway model
 func ValidateEgressGateway(gateway models.EgressGatewayRequest) error {
 	var err error
 
diff --git a/netclient/auth/auth.go b/netclient/auth/auth.go
index f74cc903..d17b82e6 100644
--- a/netclient/auth/auth.go
+++ b/netclient/auth/auth.go
@@ -55,6 +55,7 @@ func AutoLogin(client nodepb.NodeServiceClient, network string) error {
 	node := models.Node{
 		Password:   pass,
 		MacAddress: cfg.Node.MacAddress,
+		ID:         cfg.Node.ID,
 		Network:    network,
 	}
 	data, err := json.Marshal(&node)
@@ -64,6 +65,7 @@ func AutoLogin(client nodepb.NodeServiceClient, network string) error {
 
 	login := &nodepb.Object{
 		Data: string(data),
+		Type: nodepb.NODE_TYPE,
 	}
 	// RPC call
 	res, err := client.Login(context.TODO(), login)