diff --git a/data/settings.html b/data/settings.html
index 96cdb6b..15dc9e1 100644
--- a/data/settings.html
+++ b/data/settings.html
@@ -55,11 +55,11 @@
 
         <p>
           <label for="ssid">SSID</label>
-          <input id="ssid" name="ssid" type="text" value="%sensor_range%">
+          <input id="ssid" name="ssid" type="text" value="%ssid%">
         </p>
         <p>
           <label for="wifi_password">Password</label>
-          <input id="wifi_password" name="wifi_password" type="password" value="%sensor_range%">
+          <input id="wifi_password" name="wifi_password" type="password">
         </p>
 
         <p>
diff --git a/data/version b/data/version
index 7813681..62f9457 100644
--- a/data/version
+++ b/data/version
@@ -1 +1 @@
-5
\ No newline at end of file
+6
\ No newline at end of file
diff --git a/src/global_data/defines.h b/src/global_data/defines.h
index 05f9bf8..f2f5af0 100644
--- a/src/global_data/defines.h
+++ b/src/global_data/defines.h
@@ -7,7 +7,7 @@
 #define water_level_min_key "water_level_min"
 #define water_level_max_key "water_level_max"
 #define water_volume_key "water_volume"
-#define current_software_version Version{0, 0, 18}
-#define REQUIRED_SPIFFS_VERSION Version{5, 0, 0}
+#define current_software_version Version{0, 0, 19}
+#define REQUIRED_SPIFFS_VERSION Version{6, 0, 0}
 
 #define RESISTOR_VALUE 4
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 4bacb8c..22db9f2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -115,7 +115,7 @@ void setup()
         } else {
             request->send(400, "text/plain", "Missing parameters"); // TODO add proper error messages
         }
-        request->send(SPIFFS, "/settings.html", "text/html", false); // TODO add proper return templating
+        request->send(SPIFFS, "/settings.html", "text/html", false, processor); // TODO add proper return templating
     });
 
     server.on("/update_sensor_settings", HTTP_POST, [](AsyncWebServerRequest* request) {
diff --git a/src/tools/tools.cpp b/src/tools/tools.cpp
index 91094cc..738684d 100644
--- a/src/tools/tools.cpp
+++ b/src/tools/tools.cpp
@@ -40,9 +40,11 @@ String processor(const String& var)
     return String(prefs.getFloat(water_level_max_key, -1));
   } else if (var == water_volume_key) {
     return String(prefs.getFloat(water_volume_key, -1));
+  } else if (var == ssid_key) {
+    return String(prefs.getString(ssid_key, ""));
   }
     
-  return String("Test");
+  return String("");
 }
 
 // OTA Callbacks