Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r660876bca7ae34f862ae9cc6feef9a30ec02fe94 -r78f072a9cb6acc3a007171562f6e63efb8b9ae23
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 660876bca7ae34f862ae9cc6feef9a30ec02fe94)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 78f072a9cb6acc3a007171562f6e63efb8b9ae23)
@@ -118,11 +118,23 @@
  *************************************************************************/
 U32 transitionToInitAndPOSTMode( void )
 {
+    initInitAndPOSTMode();
+
     // Set user alarm recovery actions allowed in this mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE );
 
+    resetRTCPOSTState();
+    resetNVDataMgmtPOSTState();
+    resetAccelPOSTState();
+    resetWatchdogPOSTState();
+    resetSafetyShutdownPOSTState();
+    resetValvesPOSTState();
+    resetAlarmAudioPOSTState();
+    resetAlarmLampPOSTState();
+    resetStuckButtonPOSTState();
+
     return postState;
 }
 
@@ -162,14 +174,14 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
+        // NOTE: all the actuators and sensors must execute their POST after NVDataMgmt
+        // NVDataMgmt must load all the calibration data into RAM so the actuators
+        // can query their corresponding calibration values successfully
         case POST_STATE_NVDATAMGMT:
             testStatus = execNVDataMgmtSelfTest();
             postState = handlePOSTStatus( testStatus );
             break;
 
-        // NOTE: all the actuators and sensors must execute their POST after NVDataMgmt
-        // NVDataMgmt must load all the calibration data into RAM so the actuators
-        // can query their corresponding calibration values successfully
         case POST_STATE_WATCHDOG:
             testStatus = execWatchdogTest();
             postState = handlePOSTStatus( testStatus );