diff --git a/custom_components/whatspie/config_flow.py b/custom_components/whatspie/config_flow.py
index 862d3f7..a155457 100755
--- a/custom_components/whatspie/config_flow.py
+++ b/custom_components/whatspie/config_flow.py
@@ -150,6 +150,17 @@ async def async_step_init(self, user_input=None):
                 # Update entry with new options
                 return self.async_create_entry(title="", data=user_input)
 
+        # Fetch current values from options
+        api_token = self.config_entry.options.get(
+            CONF_API_TOKEN, self.config_entry.data.get(CONF_API_TOKEN)
+        )
+        from_number = self.config_entry.options.get(
+            CONF_FROM_NUMBER, self.config_entry.data.get(CONF_FROM_NUMBER)
+        )
+        country_code = self.config_entry.options.get(
+            CONF_COUNTRY_CODE, self.config_entry.data.get(CONF_COUNTRY_CODE)
+        )
+
         options_schema = vol.Schema(
             {
                 vol.Required(