A system for heating water to improve safety and efficiency. The system may have normal operation measured in time. After a time of normal operation, a water temperature setpoint may be checked. If the setpoint is not at a certain level, normal operation may continue. If the setpoint is within the certain level, water temperature may be measured. If the water temperature is less than a desired level, one or more draws of water may be measured for a preset temperature drop. If the draws do not meet the temperature drop, a return to check the setpoint may be made. If the draws meet the temperature drop, the setpoint may be reduced and a time of normal operation may be measured to determine whether a burn cycle occurs within the time. If not, normal operation may continue; but if so, a return to check the setpoint may be made.