diff --git a/custom_components/mikrotik_router/config_flow.py b/custom_components/mikrotik_router/config_flow.py
index ac210c4c..87abd8d6 100644
--- a/custom_components/mikrotik_router/config_flow.py
+++ b/custom_components/mikrotik_router/config_flow.py
@@ -175,7 +175,7 @@ class MikrotikControllerOptionsFlowHandler(OptionsFlow):
 
     def __init__(self, config_entry):
         """Initialize options flow."""
-        self.config_entry = config_entry
+        self._config_entry = config_entry
         self.options = dict(config_entry.options)
 
     async def async_step_init(self, user_input=None):
@@ -195,25 +195,25 @@ async def async_step_basic_options(self, user_input=None):
                 {
                     vol.Optional(
                         CONF_SCAN_INTERVAL,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL
                         ),
                     ): int,
                     vol.Optional(
                         CONF_TRACK_IFACE_CLIENTS,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_TRACK_IFACE_CLIENTS, DEFAULT_TRACK_IFACE_CLIENTS
                         ),
                     ): bool,
                     vol.Optional(
                         CONF_TRACK_HOSTS_TIMEOUT,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_TRACK_HOSTS_TIMEOUT, DEFAULT_TRACK_HOST_TIMEOUT
                         ),
                     ): int,
                     vol.Optional(
                         CONF_ZONE,
-                        default=self.config_entry.options.get(CONF_ZONE, STATE_HOME),
+                        default=self._config_entry.options.get(CONF_ZONE, STATE_HOME),
                     ): str,
                 }
             ),
@@ -231,86 +231,86 @@ async def async_step_sensor_select(self, user_input=None):
                 {
                     vol.Optional(
                         CONF_SENSOR_PORT_TRACKER,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SENSOR_PORT_TRACKER, DEFAULT_SENSOR_PORT_TRACKER
                         ),
                     ): bool,
                     vol.Optional(
                         CONF_SENSOR_PORT_TRAFFIC,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SENSOR_PORT_TRAFFIC, DEFAULT_SENSOR_PORT_TRAFFIC
                         ),
                     ): bool,
                     vol.Optional(
                         CONF_TRACK_HOSTS,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_TRACK_HOSTS, DEFAULT_TRACK_HOSTS
                         ),
                     ): bool,
                     vol.Optional(
                         CONF_SENSOR_CLIENT_TRAFFIC,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SENSOR_CLIENT_TRAFFIC, DEFAULT_SENSOR_CLIENT_TRAFFIC
                         ),
                     ): bool,
                     vol.Optional(
                         CONF_SENSOR_CLIENT_CAPTIVE,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SENSOR_CLIENT_CAPTIVE, DEFAULT_SENSOR_CLIENT_CAPTIVE
                         ),
                     ): bool,
                     vol.Optional(
                         CONF_SENSOR_SIMPLE_QUEUES,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SENSOR_SIMPLE_QUEUES, DEFAULT_SENSOR_SIMPLE_QUEUES
                         ),
                     ): bool,
                     vol.Optional(
                         CONF_SENSOR_NAT,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SENSOR_NAT, DEFAULT_SENSOR_NAT
                         ),
                     ): bool,
                     vol.Optional(
                         CONF_SENSOR_MANGLE,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SENSOR_MANGLE, DEFAULT_SENSOR_MANGLE
                         ),
                     ): bool,
                     vol.Optional(
                         CONF_SENSOR_FILTER,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SENSOR_FILTER, DEFAULT_SENSOR_FILTER
                         ),
                     ): bool,
                     vol.Optional(
                         CONF_SENSOR_KIDCONTROL,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SENSOR_KIDCONTROL, DEFAULT_SENSOR_KIDCONTROL
                         ),
                     ): bool,
                     vol.Optional(
                         CONF_SENSOR_NETWATCH_TRACKER,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SENSOR_NETWATCH_TRACKER,
                             DEFAULT_SENSOR_NETWATCH_TRACKER,
                         ),
                     ): bool,
                     vol.Optional(
                         CONF_SENSOR_PPP,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SENSOR_PPP, DEFAULT_SENSOR_PPP
                         ),
                     ): bool,
                     vol.Optional(
                         CONF_SENSOR_SCRIPTS,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SENSOR_SCRIPTS, DEFAULT_SENSOR_SCRIPTS
                         ),
                     ): bool,
                     vol.Optional(
                         CONF_SENSOR_ENVIRONMENT,
-                        default=self.config_entry.options.get(
+                        default=self._config_entry.options.get(
                             CONF_SENSOR_ENVIRONMENT, DEFAULT_SENSOR_ENVIRONMENT
                         ),
                     ): bool,