diff --git a/firmware/config.h b/firmware/config.h
index 00db8b3..1c95309 100755
--- a/firmware/config.h
+++ b/firmware/config.h
@@ -15,8 +15,8 @@
 #define BAT_CHARGE_STATE_CHARGING    1.0
 #define BAT_CHARGE_STATE_NOTCHARGING 0.0
 
-#define WIFI_AUTOCONNECT_TIMEOUT_S       60
-#define WIFI_CONFIG_PORTAL_TIMEOUT_S     60
+#define WIFI_AUTOCONNECT_TIMEOUT_S       120
+#define WIFI_CONFIG_PORTAL_TIMEOUT_S     120
 #define UPDATE_SENSOR_INTERVAL_S         10
 #define UPDATE_WEBSERVER_INTVERVAL_S      1
 #define DELAY_LOOP_MS                    50
diff --git a/firmware/firmware.ino b/firmware/firmware.ino
index b3eea79..d94591f 100755
--- a/firmware/firmware.ino
+++ b/firmware/firmware.ino
@@ -57,8 +57,8 @@ void setup() {
 #endif
 
   // Pin settings
-  pinMode(BAT_CHARGED_PIN, INPUT);
-  pinMode(BAT_CHARGING_PIN, INPUT);
+  pinMode(BAT_CHARGED_PIN, INPUT_PULLUP);
+  pinMode(BAT_CHARGING_PIN, INPUT_PULLUP);
   pinMode(STATUS_LED_PIN, OUTPUT);
   pinMode(ANEMOMETER_PIN, INPUT_PULLUP);
   pinMode(A0, INPUT);
@@ -214,10 +214,10 @@ void _loop() {
     // Disable expensive tasks
     if (energySavingMode() == 0) {
       currentSensorData[SENSOR_WINDSPEED] = fetchWindspeed();
-      currentSensorData[SENSOR_ESAVEMODE] = 1.0;
+      currentSensorData[SENSOR_ESAVEMODE] = 0.0;
     } else {
       currentSensorData[SENSOR_WINDSPEED] = 0xFFFFFFFF;
-      currentSensorData[SENSOR_ESAVEMODE] = 0.0;
+      currentSensorData[SENSOR_ESAVEMODE] = 1.0;
     }
 
 #ifdef DEBUG