diff --git a/Software/src/devboard/webserver/webserver.cpp b/Software/src/devboard/webserver/webserver.cpp
index 3d46bd5b..44bf05e7 100644
--- a/Software/src/devboard/webserver/webserver.cpp
+++ b/Software/src/devboard/webserver/webserver.cpp
@@ -899,21 +899,26 @@ String processor(const String& var) {
     content += "<h4>Temperature max: " + String(tempMaxFloat, 1) + " C</h4>";
     content += "<h4>Temperature min: " + String(tempMinFloat, 1) + " C</h4>";
 
-    content += "<h4>System status: ";
-    switch (datalayer.battery.status.bms_status) {
-      case ACTIVE:
+    if (datalayer.battery.status.bms_status == ACTIVE) {
+      content += "<h4>System status: OK </h4>";
+    } else if (datalayer.battery.status.bms_status == UPDATING) {
+      content += "<h4>System status: UPDATING </h4>";
+    } else {
+      content += "<h4>System status: FAULT </h4>";
+
+#ifdef MEB_BATTERY
+    content += "<h4>Battery BMS status: ";
+    switch (datalayer.battery.status.real_bms_status) {
+      case BMS_ACTIVE:
         content += String("OK");
         break;
-      case UPDATING:
-        content += String("UPDATING");
-        break;
-      case FAULT:
+      case BMS_FAULT:
         content += String("FAULT");
         break;
-      case INACTIVE:
-        content += String("INACTIVE");
+      case BMS_DISCONNECTED:
+        content += String("DISCONNECTED");
         break;
-      case STANDBY:
+      case BMS_STANDBY:
         content += String("STANDBY");
         break;
       default:
@@ -921,6 +926,7 @@ String processor(const String& var) {
         break;
     }
     content += "</h4>";
+#endif
 
     if (datalayer.battery.status.current_dA == 0) {
       content += "<h4>Battery idle</h4>";
@@ -1054,28 +1060,12 @@ String processor(const String& var) {
     }
     content += "<h4>Temperature max: " + String(tempMaxFloat, 1) + " C</h4>";
     content += "<h4>Temperature min: " + String(tempMinFloat, 1) + " C</h4>";
-    content += "<h4>System status: ";
-    switch (datalayer.battery2.status.bms_status) {
-      case ACTIVE:
-        content += String("OK");
-        break;
-      case UPDATING:
-        content += String("UPDATING");
-        break;
-      case FAULT:
-        content += String("FAULT");
-        break;
-      case INACTIVE:
-        content += String("INACTIVE");
-        break;
-      case STANDBY:
-        content += String("STANDBY");
-        break;
-      default:
-        content += String("??");
-        break;
-    }
-    content += "</h4>";
+    if (datalayer.battery.status.bms_status == ACTIVE) {
+      content += "<h4>System status: OK </h4>";
+    } else if (datalayer.battery.status.bms_status == UPDATING) {
+      content += "<h4>System status: UPDATING </h4>";
+    } else {
+      content += "<h4>System status: FAULT </h4>";
     if (datalayer.battery2.status.current_dA == 0) {
       content += "<h4>Battery idle</h4>";
     } else if (datalayer.battery2.status.current_dA < 0) {