diff --git a/lib/lws-plat-esp32.c b/lib/lws-plat-esp32.c
index cd631f80..33569633 100644
--- a/lib/lws-plat-esp32.c
+++ b/lib/lws-plat-esp32.c
@@ -1366,10 +1366,13 @@ lws_esp32_wlan_nvs_get(int retry)
 	s = sizeof(lws_esp32.role);
 	nvs_get_str(nvh, "role", lws_esp32.role, &s);
 
-	lws_snprintf(lws_esp32.hostname, sizeof(lws_esp32.hostname) - 1,
-			"%s-%s-%s", lws_esp32.model,
-			lws_esp32.group,
-			lws_esp32.serial);
+	/* if group and role defined: group-role */
+	if (lws_esp32.group[0] && lws_esp32.role[0])
+		lws_snprintf(lws_esp32.hostname, sizeof(lws_esp32.hostname) - 1,
+				"%s-%s", lws_esp32.group, lws_esp32.role);
+	else /* otherwise model-serial */
+		lws_snprintf(lws_esp32.hostname, sizeof(lws_esp32.hostname) - 1,
+				"%s-%s", lws_esp32.model, lws_esp32.serial);
 
 	nvs_close(nvh);
 
diff --git a/lib/server.c b/lib/server.c
index db214bd9..ae01d058 100644
--- a/lib/server.c
+++ b/lib/server.c
@@ -308,6 +308,9 @@ lws_get_mimetype(const char *file, const struct lws_http_mount *m)
 	if (!strcmp(&file[n - 4], ".ttf"))
 		return "application/x-font-ttf";
 
+	if (!strcmp(&file[n - 4], ".otf"))
+		return "application/font-woff";
+
 	if (!strcmp(&file[n - 5], ".woff"))
 		return "application/font-woff";