If you must keep the water heater on until repairs are made, the CPSC said you should have working smoke and carbon monoxide ...