diff --git a/linka-firmware.ino b/linka-firmware.ino
index 1fe95e4..35d7513 100644
--- a/linka-firmware.ino
+++ b/linka-firmware.ino
@@ -451,8 +451,8 @@ void initOta()
 */
 bool initWifi()
 {
-  // Let WiFi Manager handle connections
-  wc.setDebug(true);
+  // Disable debug for WiFi connect
+  wc.setDebug(false);
 
   /* Set our callbacks */
   wc.setAPCallback(configModeCallback);
@@ -468,6 +468,9 @@ bool initWifi()
   sprintf(ap_name, "linka-%x", g_device_id);
   wc.setAPName(ap_name);
 
+  // Set correct hostname
+  WiFi.hostname(ap_name);
+
   //set config save notify callback
   wc.setSaveConfigCallback(saveConfigCallback);