diff --git a/script/hassfest/config_flow.py b/script/hassfest/config_flow.py
index c31e77ccdff..44f2b2d59ae 100644
--- a/script/hassfest/config_flow.py
+++ b/script/hassfest/config_flow.py
@@ -31,7 +31,7 @@ def validate_integration(config: Config, integration: Integration):
         return
 
     needs_unique_id = integration.domain not in UNIQUE_ID_IGNORE and any(
-        key in integration.manifest
+        bool(integration.manifest.get(key))
         for keys in DISCOVERY_INTEGRATIONS.values()
         for key in keys
     )
diff --git a/script/scaffold/generate.py b/script/scaffold/generate.py
index 77317a20185..93f5db58587 100644
--- a/script/scaffold/generate.py
+++ b/script/scaffold/generate.py
@@ -125,9 +125,9 @@ def _custom_tasks(template, info) -> None:
                     }
                 },
                 "error": {
-                    "cannot_connect": "[%key:common::config_flow::abort::cannot_connect%]",
-                    "invalid_auth": "[%key:common::config_flow::abort::invalid_auth%]",
-                    "unknown": "[%key:common::config_flow::abort::unknown%]",
+                    "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+                    "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+                    "unknown": "[%key:common::config_flow::error::unknown%]",
                 },
                 "abort": {
                     "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"