diff --git a/ampel-firmware/ampel-firmware.ino b/ampel-firmware/ampel-firmware.ino
index 15a4aebc6c4a1201e06d43f5090f601885f7b558..3f4cc494de1cd684e0ed06b1e735b6f5df686148 100644
--- a/ampel-firmware/ampel-firmware.ino
+++ b/ampel-firmware/ampel-firmware.ino
@@ -165,6 +165,7 @@ void loop() {
 
   if (sensor::processData()) {
 #ifdef AMPEL_CSV
+    //TODO: Check if not in AP mode. Lines get written with 1970 otherwise.
     csv_writer::logIfTimeHasCome(sensor::timestamp, sensor::co2, sensor::temperature, sensor::humidity);
 #endif
 
diff --git a/ampel-firmware/web_config.cpp b/ampel-firmware/web_config.cpp
index 2c47d0d436b5f00e8298d8262141bd85435a0186..adaa9205acf4f67eb9fe98d2d7e646977b067ff5 100644
--- a/ampel-firmware/web_config.cpp
+++ b/ampel-firmware/web_config.cpp
@@ -45,7 +45,7 @@ namespace web_config {
           2).max(1800).placeholder("[s]").build();
 
   FloatTParameter temperatureOffsetParam =
-      Builder<FloatTParameter>("temp_offset").label("Temperature offset").defaultValue( TEMPERATURE_OFFSET).placeholder(
+      Builder<FloatTParameter>("temp_offset").label("Temperature offset").defaultValue(TEMPERATURE_OFFSET).placeholder(
           "[K]").step(0.1).build();
 
   IntTParameter<uint16_t> altitudeParam = Builder<IntTParameter<uint16_t>>("altitude").label("Altitude").defaultValue(
@@ -56,7 +56,7 @@ namespace web_config {
   ATMOSPHERIC_CO2_CONCENTRATION).min(400).max(2000).step(1).placeholder("ppm").build();
 
   CheckboxTParameter autoCalibrateParam = Builder<CheckboxTParameter>("asc").label("Auto-calibration").defaultValue(
-      true).build();
+  AUTO_CALIBRATE_SENSOR).build();
 
   /**
    * LED