Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -rc7ea3969643ead419cbfcd34c3cb203c45bcad71 -ra33ab8f72a09be4650026964dd2bd35ff95c8431
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision c7ea3969643ead419cbfcd34c3cb203c45bcad71)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision a33ab8f72a09be4650026964dd2bd35ff95c8431)
@@ -76,7 +76,7 @@
 static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T handleFirstDrainState( void );
 static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T handleFlushFillState( void );
 static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T handleSecondDrainState( void );
-static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T handleRefillState( void );
+static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T handleRefillState( DG_GEN_IDLE_MODE_STATE_T* idleState );
 
 static void publishGenIdleSubstates();
 
@@ -280,7 +280,7 @@
  * The handleBadFillState function executes the bad fill state of the
  * generation idle mode state machine.
  * @details Inputs: none
- * @details Outputs: badFillState
+ * @details Outputs: badFillState, genIdleState
  * @return the next state
  *************************************************************************/
 static DG_GEN_IDLE_MODE_STATE_T handleBadFillState( void )
@@ -307,7 +307,7 @@
             break;
 
         case DG_HANDLE_BAD_FILL_STATE_REFILL:
-            badFillState = handleRefillState();
+            badFillState = handleRefillState( &genIdleState );
             break;
 
         default:
@@ -405,16 +405,18 @@
  * fill state machine.
  * @details Inputs: none
  * @details Outputs: none
+ * @param state pointer to the GenIdle main state machine to be processed
  * @return the next state
  *************************************************************************/
-static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T handleRefillState( void )
+static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T handleRefillState( DG_GEN_IDLE_MODE_STATE_T* idleState )
 {
     DG_GEN_IDLE_MODE_BAD_FILL_STATE_T state = DG_HANDLE_BAD_FILL_STATE_START;
 
     // Clear wait for dialysate alarm condition to allow resume
     clearAlarmCondition( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );  // resume option will appear
     // Set flag to FALSE here so next call to idle exec will move to normal flush water state
     handleBadFillFlag = FALSE;
+    *idleState        = DG_GEN_IDLE_MODE_STATE_START;
 
     return state;
 }
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r3e5c16b70fb34da7d58f5cf6efff896fdb3d00c3 -ra33ab8f72a09be4650026964dd2bd35ff95c8431
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 3e5c16b70fb34da7d58f5cf6efff896fdb3d00c3)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision a33ab8f72a09be4650026964dd2bd35ff95c8431)
@@ -79,6 +79,7 @@
 #define RSRVRS_DRAIN_TIMEOUT_MS                    ( 2 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 drain timeout in ms.
 
 // Target temperature
+#define HEAT_DISINFECT_PRIM_HEATER_FLUSH_TARGET_TEMP_C 60.0F                                                   ///< Heat disinfect primary heater flush target temperature C.
 #define HEAT_DISINFECT_PRIM_HEATER_TARGET_TEMP_C   90.0F                                                       ///< Heat disinfect primary heater target temperature in C.
 #define HEAT_DISINFECT_TRIM_HEATER_TARGET_TEMP_C   90.0F                                                       ///< Heat disinfect trimmer heater target temperature in C.
 #define HEAT_DISINFECT_CONC_PUMPS_START_TEMP_C     75.0F                                                       ///< Heat disinfect start concentrate pumps target temperature in C.
@@ -724,7 +725,7 @@
             if ( nelsonSupport != NELSON_INOCULATE )
 #endif
             {
-                setHeaterTargetTemperature( DG_PRIMARY_HEATER, HEAT_DISINFECT_PRIM_HEATER_TARGET_TEMP_C );
+                setHeaterTargetTemperature( DG_PRIMARY_HEATER, HEAT_DISINFECT_PRIM_HEATER_FLUSH_TARGET_TEMP_C );
                 startHeater( DG_PRIMARY_HEATER );
             }