diff --git a/custom_components/fpl/__init__.py b/custom_components/fpl/__init__.py
index 5fe15f4..a741e9d 100644
--- a/custom_components/fpl/__init__.py
+++ b/custom_components/fpl/__init__.py
@@ -14,11 +14,10 @@ from .fplapi import FplApi
 from .const import (
     DOMAIN,
     DOMAIN_DATA,
-    CONF_USERNAME,
-    CONF_PASSWORD,
     PLATFORMS,
     STARTUP_MESSAGE,
 )
+from homeassistant.const import CONF_USERNAME, CONF_PASSWORD
 from .fplDataUpdateCoordinator import FplDataUpdateCoordinator
 
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=30)
diff --git a/custom_components/fpl/config_flow.py b/custom_components/fpl/config_flow.py
index 707ee6d..1424502 100644
--- a/custom_components/fpl/config_flow.py
+++ b/custom_components/fpl/config_flow.py
@@ -7,7 +7,8 @@ from homeassistant import config_entries
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
 from homeassistant.core import callback
 
-from .const import DOMAIN, CONF_USERNAME, CONF_PASSWORD, CONF_NAME
+from homeassistant.const import CONF_USERNAME, CONF_PASSWORD, CONF_NAME
+from .const import DOMAIN
 
 from .fplapi import (
     LOGIN_RESULT_OK,
@@ -38,7 +39,7 @@ class FplFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         self._errors = {}
 
     async def async_step_user(
-        self, user_input={}
+        self, user_input=None
     ):  # pylint: disable=dangerous-default-value
         """Handle a flow initialized by the user."""
         self._errors = {}