diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index 8a40cff1bd5258..6f9d8ff66c0e91 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -598,8 +598,8 @@ async def _async_finish_flow(self, flow, result):
             domain=result["handler"],
             title=result["title"],
             data=result["data"],
-            options={},
-            system_options={},
+            options=result.get("options", {}),
+            system_options=result.get("system_options", {}),
             source=flow.context["source"],
             connection_class=flow.CONNECTION_CLASS,
         )
diff --git a/homeassistant/data_entry_flow.py b/homeassistant/data_entry_flow.py
index 0bc27498f767e8..9f9c919796bcaa 100644
--- a/homeassistant/data_entry_flow.py
+++ b/homeassistant/data_entry_flow.py
@@ -208,6 +208,7 @@ def async_create_entry(
         data: Dict,
         description: Optional[str] = None,
         description_placeholders: Optional[Dict] = None,
+        **kwargs: Any,
     ) -> Dict[str, Any]:
         """Finish config flow and create a config entry."""
         return {
@@ -219,6 +220,7 @@ def async_create_entry(
             "data": data,
             "description": description,
             "description_placeholders": description_placeholders,
+            **kwargs,
         }
 
     @callback