diff --git a/main/accessors/settingsaccessors.h b/main/accessors/settingsaccessors.h
index 19cfde2..df23d8f 100644
--- a/main/accessors/settingsaccessors.h
+++ b/main/accessors/settingsaccessors.h
@@ -254,3 +254,6 @@ struct ButtonProfile0Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrap
 struct ButtonProfile1Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingProfile1; } };
 struct ButtonProfile2Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingProfile2; } };
 struct ButtonProfile3Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingProfile3; } };
+
+// Can
+struct CanResetOnErrorAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.canResetOnError; } };
diff --git a/main/can.cpp b/main/can.cpp
index 075b302..86021f2 100644
--- a/main/can.cpp
+++ b/main/can.cpp
@@ -273,14 +273,13 @@ void sendCanCommands()
 
         const auto timestamp_before = espchrono::millis_clock::now();
         const auto result = twai_transmit(&message, timeout);
+
         if (result != ESP_OK && result != ESP_ERR_TIMEOUT)
         {
             ESP_LOGE(TAG, "ERROR: twai_transmit() failed with %s", esp_err_to_name(result));
         }
-
-
-
-        if (result == ESP_ERR_TIMEOUT) {
+        else if (result == ESP_ERR_TIMEOUT)
+        {
             ++can_sequential_error_cnt;
             ++can_total_error_cnt;
 
@@ -288,20 +287,29 @@ void sendCanCommands()
                      espchrono::ago(timestamp_before).count(),
                      can_sequential_error_cnt,
                      can_total_error_cnt);
-        } else {
+        }
+        else
+        {
             can_sequential_error_cnt = 0;
         }
 
 
-        if (can_sequential_error_cnt > 3) {
+        if (can_sequential_error_cnt > 3)
+        {
             can_sequential_error_cnt = 0;
-            if (configs.canBusResetOnError.value) {
-                ESP_LOGE(TAG, "CAN BUS RESET: twai_stop(): %s", esp_err_to_name(twai_stop()));
-                ESP_LOGE(TAG, "CAN BUS RESET: twai_start(): %s", esp_err_to_name(twai_start()));
-
+            if (configs.canResetOnError.value)
+            {
+                ESP_LOGW(TAG, "WARNING: Something isn't right, trying to restart can ic...");
+                if (const auto err = twai_stop(); err != ESP_OK)
+                {
+                    ESP_LOGE(TAG, "ERROR: twai_stop() failed with %s", esp_err_to_name(err));
+                }
+                if (const auto err = twai_start(); err != ESP_OK)
+                {
+                    ESP_LOGE(TAG, "ERROR: twai_start() failed with %s", esp_err_to_name(err));
+                }
             }
         }
-
         return result;
     };
 
diff --git a/main/displays/menus/controllerhardwaresettingsmenu.cpp b/main/displays/menus/controllerhardwaresettingsmenu.cpp
index a49a3ad..e4d7c5b 100644
--- a/main/displays/menus/controllerhardwaresettingsmenu.cpp
+++ b/main/displays/menus/controllerhardwaresettingsmenu.cpp
@@ -31,6 +31,7 @@ constexpr char TEXT_FRONTSENDCAN[] = "Front send CAN";
 constexpr char TEXT_BACKSENDCAN[] = "Back send CAN";
 constexpr char TEXT_CANTRANSMITTIMEOUT[] = "CanTransmitTimeout";
 constexpr char TEXT_CANRECEIVETIMEOUT[] = "CanReceiveTimeout";
+constexpr char TEXT_CANRESETONERROR[] = "Reset on error";
 #endif
 constexpr char TEXT_BACK[] = "Back";
 
@@ -77,19 +78,20 @@ using CanReceiveTimeoutChangeScreen = espgui::makeComponent<
 ControllerHardwareSettingsMenu::ControllerHardwareSettingsMenu()
 {
     using namespace espgui;
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SETENABLED>,        SwitchScreenAction<EnableMenu>>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SETINVERTED>,       SwitchScreenAction<InvertMenu>>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_WHEELDIAMETERMM>,   SwitchScreenAction<WheelDiameterMmChangeScreen>>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_WHEELDIAMETERINCH>, SwitchScreenAction<WheelDiameterInchChangeScreen>>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_NUMMAGNETPOLES>,    SwitchScreenAction<NumMagnetPolesChangeScreen>>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SWAPFRONTBACK>,     BobbyCheckbox, SwapFrontBackAccessor>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SETENABLED>,         SwitchScreenAction<EnableMenu>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SETINVERTED>,        SwitchScreenAction<InvertMenu>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_WHEELDIAMETERMM>,    SwitchScreenAction<WheelDiameterMmChangeScreen>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_WHEELDIAMETERINCH>,  SwitchScreenAction<WheelDiameterInchChangeScreen>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_NUMMAGNETPOLES>,     SwitchScreenAction<NumMagnetPolesChangeScreen>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SWAPFRONTBACK>,      BobbyCheckbox, SwapFrontBackAccessor>>();
 #ifdef FEATURE_CAN
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_FRONTSENDCAN>,       BobbyCheckbox, SendFrontCanCmdAccessor>>();
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACKSENDCAN>,        BobbyCheckbox, SendBackCanCmdAccessor>>();
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CANTRANSMITTIMEOUT>, SwitchScreenAction<CanTransmitTimeoutChangeScreen>>>();
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CANRECEIVETIMEOUT>,  SwitchScreenAction<CanReceiveTimeoutChangeScreen>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CANRESETONERROR>,    BobbyCheckbox, CanResetOnErrorAccessor>>();
 #endif
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,              SwitchScreenAction<SettingsMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,               SwitchScreenAction<SettingsMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
 std::string ControllerHardwareSettingsMenu::text() const
diff --git a/main/newsettings.h b/main/newsettings.h
index fdbe435..2423605 100644
--- a/main/newsettings.h
+++ b/main/newsettings.h
@@ -118,7 +118,7 @@ public:
     ConfigWrapper<espchrono::minutes32> timezoneOffset{espchrono::minutes32{60},           DoReset,   {},                           "timezoneOffset"      }; // MinMaxValue<minutes32, -1440m, 1440m>
     ConfigWrapper<espchrono::DayLightSavingMode>timeDst{espchrono::DayLightSavingMode::EuropeanSummerTime, DoReset, {},             "time_dst"            };
 
-    ConfigWrapper<bool>        canBusResetOnError {false,                                  DoReset,   {},                           "canBusRstErr"        };
+    ConfigWrapper<bool>           canResetOnError {false,                                  DoReset,   {},                           "canBusRstErr"        };
 
     ConfigWrapper<int16_t>     sampleCount        {50,                                     DoReset,   {},                           "sampleCount"         };
     ConfigWrapper<int16_t>     gasMin             {0,                                      DoReset,  MinMaxValue<int16_t, 0, 4095>, "gasMin"              };
@@ -301,7 +301,7 @@ public:
     x(timezoneOffset) \
     x(timeDst) \
     \
-    x(canBusResetOnError) \
+    x(canResetOnError) \
     \
     x(sampleCount) \
     x(gasMin) \