diff --git a/drivers/network/dd/nvnet/eth.h b/drivers/network/dd/nvnet/eth.h
index 82d7097548d..98bb79ba26e 100644
--- a/drivers/network/dd/nvnet/eth.h
+++ b/drivers/network/dd/nvnet/eth.h
@@ -20,8 +20,8 @@ typedef struct _ETH_HEADER
     (BOOLEAN)(((PUCHAR)(Address))[0] & ((UCHAR)0x02))
 
 #define ETH_IS_EMPTY(Address) \
-    (BOOLEAN)((((PUCHAR)(Address))[0] | ((PUCHAR)(Address))[1] | ((PUCHAR)(Address))[2] | \
-               ((PUCHAR)(Address))[3] | ((PUCHAR)(Address))[5] | ((PUCHAR)(Address))[5]) == 0)
+    ((BOOLEAN)((((PUCHAR)(Address))[0] | ((PUCHAR)(Address))[1] | ((PUCHAR)(Address))[2] | \
+                ((PUCHAR)(Address))[3] | ((PUCHAR)(Address))[4] | ((PUCHAR)(Address))[5]) == 0))
 
 typedef struct IPv4_HEADER
 {
diff --git a/drivers/network/dd/nvnet/init.c b/drivers/network/dd/nvnet/init.c
index 8964805494c..a83c7413eac 100644
--- a/drivers/network/dd/nvnet/init.c
+++ b/drivers/network/dd/nvnet/init.c
@@ -175,6 +175,7 @@ NvNetReadConfiguration(
                  0,
                  0,
                  NVNET_MAXIMUM_VLAN_ID);
+    Adapter->VlanId = GenericUlong;
 
     NdisReadNetworkAddress(&Status,
                            (PVOID*)&NetworkAddress,