diff --git a/src/charger.c b/src/charger.c
index 2cfb4100f152ffdccc247cdd60653c753e01f453..9c44d16683625a7e22ff91f9fa14f3187e787483 100644
--- a/src/charger.c
+++ b/src/charger.c
@@ -266,6 +266,7 @@ void charger_send_next_command(void)
             smbus_attempts=0;
           }
         }
+        charger_set_limit_curret();
         charger_set_commands();
       }
     }
@@ -540,7 +541,6 @@ void CHARGER_TIMER_IRQHandler(void)
       if((ram_data[BATTERY_CHARGER_STATUS]&0x04)==0)// battery not present
       {
         // add commands to the command queue
-        charger_set_limit_curret();
         charger_set_charge_curret();
         charger_set_charge_voltage();
       }
@@ -599,12 +599,12 @@ void charger_init(void)
   if(HAL_SMBUS_IsDeviceReady(&SMBusHandle,ram_data[BATTERY_FUEL_GAUGE_ADDR],1,10)!=HAL_OK)
   {
     ram_data[BATTERY_CHARGER_STATUS]&=0xFB;
-    charger_set_limit_curret();
     charger_set_charge_curret();
     charger_set_charge_voltage();
   }
   else
     ram_data[BATTERY_CHARGER_STATUS]|=0x04;
+  charger_set_limit_curret();
   charger_set_commands();
   smbus_error=0x00;
   smbus_attempts=0x00;
diff --git a/src/mem.c b/src/mem.c
index 65e7d6000273eff09e5bd10f3f72e719a1b50e96..43e5c452dfa66f7c85aeecd3dffdb609be2abf81 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -27,8 +27,8 @@ uint8_t eeprom_data[EEPROM_SIZE] __attribute__ ((section (".eeprom")))={
   0x00,
   0x05,
   0x00,
-  0xF4,
-  0x01,
+  0x94,
+  0x11,
   0xE8,
   0x03,
   0xE0,