diff --git a/src/common/network/dhcp.c b/src/common/network/dhcp.c
index 9d4f5ad..f0ae48f 100644
--- a/src/common/network/dhcp.c
+++ b/src/common/network/dhcp.c
@@ -13,8 +13,8 @@
 #include "udp.h"
 #include "dhcp.h"
 
-#define WITH_CLIENT_ID	1
 const char hostname[] = "ml402";
+const char vendor[] = "Jayfield Inc.";
 
 // -------------------------------------------------------------------------
 // Testing
@@ -44,7 +44,6 @@ void DHCP_request_send(packet_t *pPacket, uint8_t dhcp_msg_type, uint8_t *mac_ad
 	option_list_append(&options, DHCP_OPT_MSGTYPE, &dhcp_msg_type, 1);
 
 	// Set vendor ID
-	const char vendor[] = "AVM multid FRITZ!Box 7362 SL (UI)";
 	option_list_append(&options, DHCP_OPT_VENDORID, vendor, strlen(vendor));
 
 	// Set client ID
diff --git a/src/test_emac.c b/src/test_emac.c
index d67d3bc..366cae7 100644
--- a/src/test_emac.c
+++ b/src/test_emac.c
@@ -154,7 +154,7 @@ void Phy_print_regs(Mii_t *pMii, uint16_t phy_id)
 // -------------------------------------------------------------------
 uint8_t eth_bcst[6]= {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
 uint8_t eth_zero[6]= {0x00,0x00,0x00,0x00,0x00,0x00};
-uint8_t eth_myself[6] = {0x22,0x07,0x31,0x10,0x19,0x70};
+uint8_t eth_myself[6] = {0xc8,0x10,0x70,0x22,0x07,0x69};
 
 uint8_t ip_zero[4] = {0, 0, 0, 0};
 uint8_t ip_bcast[4] = {255, 255, 255, 255};
@@ -280,8 +280,7 @@ int main()
 	*pEmac_tx_ctrl |= EMAC_TX_CTRL_GIGABIT;
 
 	// Set MAC address
-	*(pEmac_maddr+0) = 0x00003110;
-	*(pEmac_maddr+1) = 0x19700000;
+	EMAC_MACADDR_set(eth_myself);
 
 	printf("Own MAC address = ");
 	for (i=0; i < 6; i++)
@@ -337,7 +336,7 @@ int main()
 			DHCP *pDHCP;
 			if (dhcp_state == 1)
 			{
-				for (int kk=0; kk < 3; kk++)
+				for (int kk=0; kk < 1; kk++)
 				{
 					printf("---------------------------------------------------------------\n");
 					printf("- Send DHCP Discover ------------------------------------------\n");