diff --git a/advanced/esphome/nspanel_esphome_advanced.yaml b/advanced/esphome/nspanel_esphome_advanced.yaml
index fd7940e..033e2ad 100644
--- a/advanced/esphome/nspanel_esphome_advanced.yaml
+++ b/advanced/esphome/nspanel_esphome_advanced.yaml
@@ -7,6 +7,13 @@
 ##### ATTENTION: This will add advanced elements to the core system and requires the core part. #####
 #####################################################################################################
 ---
+substitutions:
+  ##### Do not change this here.  #####
+  ##### Set your substitutions on #####
+  ##### your base yaml file.      #####
+  web_password: ${wifi_password}
+  #####################################
+
 button:
   ##### EXIT REPARSE TFT DISPLAY #####
   - name: ${device_name} Exit reparse
@@ -89,4 +96,4 @@ web_server:
   port: 80
   auth:
     username: admin
-    password: ${wifi_password}
+    password: ${web_password}
diff --git a/advanced/esphome/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml
index 70575db..40f0a57 100644
--- a/advanced/esphome/nspanel_esphome_core.yaml
+++ b/advanced/esphome/nspanel_esphome_core.yaml
@@ -6,11 +6,16 @@
 #####################################################################################################
 ---
 substitutions:
-  ##### DON'T CHANGE THIS #####
-  version: "4.2dev.3"
+  ##############################
+  ## Change only in your      ##
+  ## local yaml substitutions ##
   temp_units: "°C"
   invalid_cooldown: "500ms"
-  #############################
+  ota_password: ${wifi_password}
+  ap_password: ${wifi_password}
+  ##### DON'T CHANGE THIS ######
+  version: "4.2dev.3"
+  ##############################
 
 ##### External components #####
 external_components:
@@ -103,7 +108,7 @@ wifi:
       password: ${wifi_password}
   ap:
     ssid: "${device_name}"
-    password: ${wifi_password}
+    password: ${ap_password}
   on_connect:
     then:
       - script.execute: watchdog
@@ -114,7 +119,7 @@ wifi:
 ##### OTA PASSWORD #####
 ota:
   id: ota_std
-  password: ${wifi_password}
+  password: ${ota_password}
   safe_mode: true
   reboot_timeout: 3min
   num_attempts: 3