From 95e38b16f9137d9ca1bda1db79a9712b2d098b2d Mon Sep 17 00:00:00 2001
From: ollo69 <60491700+ollo69@users.noreply.github.com>
Date: Sat, 23 Apr 2022 13:28:09 +0200
Subject: [PATCH] Address late review of  AsusWRT config flow changes (#70448)

* Address late review of  AsusWRT config flow changes

* Review schema preparation

* Requested changes
---
 .../components/asuswrt/config_flow.py         | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/asuswrt/config_flow.py b/homeassistant/components/asuswrt/config_flow.py
index c431b6789bd..ab62b879f75 100644
--- a/homeassistant/components/asuswrt/config_flow.py
+++ b/homeassistant/components/asuswrt/config_flow.py
@@ -80,25 +80,26 @@ class AsusWrtFlowHandler(ConfigFlow, domain=DOMAIN):
         if user_input is None:
             user_input = {}
 
+        adv_schema = {}
+        conf_password = vol.Required(CONF_PASSWORD)
+        if self.show_advanced_options:
+            conf_password = vol.Optional(CONF_PASSWORD)
+            adv_schema[vol.Optional(CONF_PORT)] = cv.port
+            adv_schema[vol.Optional(CONF_SSH_KEY)] = str
+
         schema = {
             vol.Required(CONF_HOST, default=user_input.get(CONF_HOST, "")): str,
             vol.Required(CONF_USERNAME, default=user_input.get(CONF_USERNAME, "")): str,
-            vol.Optional(CONF_PASSWORD)
-            if self.show_advanced_options
-            else vol.Required(CONF_PASSWORD): str,
+            conf_password: str,
             vol.Required(CONF_PROTOCOL, default=PROTOCOL_SSH): vol.In(
                 {PROTOCOL_SSH: "SSH", PROTOCOL_TELNET: "Telnet"}
             ),
+            **adv_schema,
+            vol.Required(CONF_MODE, default=MODE_ROUTER): vol.In(
+                {MODE_ROUTER: "Router", MODE_AP: "Access Point"}
+            ),
         }
 
-        if self.show_advanced_options:
-            schema[vol.Optional(CONF_PORT)] = cv.port
-            schema[vol.Optional(CONF_SSH_KEY)] = str
-
-        schema[vol.Required(CONF_MODE, default=MODE_ROUTER)] = vol.In(
-            {MODE_ROUTER: "Router", MODE_AP: "Access Point"}
-        )
-
         return self.async_show_form(
             step_id="user",
             data_schema=vol.Schema(schema),