diff --git a/esphome/nspanel_esphome_advanced.yaml b/esphome/nspanel_esphome_advanced.yaml
index a97c37a..6b145c0 100644
--- a/esphome/nspanel_esphome_advanced.yaml
+++ b/esphome/nspanel_esphome_advanced.yaml
@@ -11,6 +11,7 @@ substitutions:
   ##############################
   ## Change only in your      ##
   ## local yaml substitutions ##
+  ap_password: ${wifi_password}
   web_password: ${wifi_password}
   ##############################
 
@@ -102,4 +103,9 @@ web_server:
   auth:
     username: admin
     password: ${web_password}
+
+wifi:
+  ap:
+    ssid: "${name}"
+    password: ${ap_password}
 ...
diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml
index 5afa494..472c0e7 100644
--- a/esphome/nspanel_esphome_core.yaml
+++ b/esphome/nspanel_esphome_core.yaml
@@ -12,7 +12,6 @@ substitutions:
   device_name: NSPanel
   name: ${device_name}
   friendly_name: ${device_name}
-  ap_password: ${wifi_password}
   ota_password: ${wifi_password}
   web_password: ${wifi_password}
   temp_units: "°C"
@@ -110,9 +109,6 @@ wifi:
     - id: wifi_default
       ssid: ${wifi_ssid}
       password: ${wifi_password}
-  ap:
-    ssid: "${name}"
-    password: ${ap_password}
   on_connect:
     - lambda: |-
         disp1->send_command_printf("api=%i", (wifi_component->is_connected() and api_server->is_connected() and blueprint_status->state > 99) ? 1 : 0);