diff --git a/src/httpserver/new_http.c b/src/httpserver/new_http.c
index f48121af0..4dbb7a18a 100644
--- a/src/httpserver/new_http.c
+++ b/src/httpserver/new_http.c
@@ -321,11 +321,18 @@ const char *g_header = "<h1><a href=\"https://github.com/openshwprojects/OpenBK7
 
 void HTTP_AddBuildFooter(http_request_t *request) {
 	char upTimeStr[128];
+	unsigned char mac[32];
 	poststr(request,"<br>");
 	poststr(request,g_build_str);
 	poststr(request,"<br> Online for ");
 	misc_formatUpTimeString(Time_getUpTimeSeconds(), upTimeStr);
 	poststr(request,upTimeStr);
+
+	WiFI_GetMacAddress((char *)mac);
+
+	sprintf(upTimeStr,"<br> Device MAC: %02X%02X%02X%02X%02X%02X",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]);
+	poststr(request,upTimeStr);
+
 }
 
 
@@ -860,6 +867,8 @@ int HTTP_ProcessPacket(http_request_t *request) {
 		poststr(request,g_header);
 		poststr(request,"<h4>Home Assistant Cfg</h4>");
 		poststr(request,"<h4>Paste this to configuration yaml</h4>");
+		poststr(request,"<h5>Make sure that you have \"switch:\" keyword only once! Home Assistant doesn't like dup keywords.</h5>");
+		poststr(request,"<h5>You can also use \"switch MyDeviceName:\" to avoid keyword duplication!</h5>");
 		
 		poststr(request,"<textarea rows=\"40\" cols=\"50\">");
 
diff --git a/src/new_cfg.c b/src/new_cfg.c
index 03b5dea29..0b303ce4b 100644
--- a/src/new_cfg.c
+++ b/src/new_cfg.c
@@ -94,10 +94,7 @@ const char *CFG_GetShortDeviceName(){
 #define DEVICENAME_PREFIX_SHORT "obk"
 #endif
 
-void CFG_CreateDeviceNameUnique()
-{
-	// must be unsigned, else print below prints negatives as e.g. FFFFFFFe
-	unsigned char mac[32];
+void WiFI_GetMacAddress(char *mac) {
 #if WINDOWS
 
 #elif PLATFORM_XR809
@@ -105,6 +102,15 @@ void CFG_CreateDeviceNameUnique()
 #else
     wifi_get_mac_address((char *)mac, CONFIG_ROLE_STA);
 #endif
+}
+
+void CFG_CreateDeviceNameUnique()
+{
+	// must be unsigned, else print below prints negatives as e.g. FFFFFFFe
+	unsigned char mac[32];
+
+	WiFI_GetMacAddress((char *)mac);
+
 	sprintf(g_deviceName,DEVICENAME_PREFIX_FULL"_%02X%02X%02X%02X",mac[2],mac[3],mac[4],mac[5]);
 	sprintf(g_shortDeviceName,DEVICENAME_PREFIX_SHORT"%02X%02X%02X%02X",mac[2],mac[3],mac[4],mac[5]);
 
diff --git a/src/new_cfg.h b/src/new_cfg.h
index 0c030a374..9990ea05e 100644
--- a/src/new_cfg.h
+++ b/src/new_cfg.h
@@ -26,3 +26,5 @@ const char *CFG_GetWebappRoot();
 const char *CFG_LoadWebappRoot();
 void CFG_SetWebappRoot(const char *s);
 void CFG_InitAndLoad();
+void WiFI_GetMacAddress(char *mac);
+