Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rb4bc2e0337b358ee180650101d98e18346bf7c22 -r06a49a103e6c62257c56fdbb19fc5b0a518095df
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision b4bc2e0337b358ee180650101d98e18346bf7c22)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 06a49a103e6c62257c56fdbb19fc5b0a518095df)
@@ -399,6 +399,8 @@
             break;
 
         case DRAIN_COMPLETE_STATE:
+            currentDrainReservoirState = DRAIN_FIRST_RESERVOIR_START_STATE;
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_POST_TREATMENT_RESERVOIR_MGMT_INVALID_STATE, currentDrainReservoirState );
             break;
 
         default:
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rb4bc2e0337b358ee180650101d98e18346bf7c22 -r06a49a103e6c62257c56fdbb19fc5b0a518095df
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision b4bc2e0337b358ee180650101d98e18346bf7c22)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 06a49a103e6c62257c56fdbb19fc5b0a518095df)
@@ -807,7 +807,7 @@
 
         default:
             currentReservoirMgmtState = PRE_TREATMENT_RESERVOIR_MGMT_START_STATE;
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_PRIME_RESERVOIR_MGMT_INVALID_STATE, (U32)currentReservoirMgmtState );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_PRE_TREATMENT_RESERVOIR_MGMT_INVALID_STATE, currentReservoirMgmtState );
             break;
     }
 }
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -rb4bc2e0337b358ee180650101d98e18346bf7c22 -r06a49a103e6c62257c56fdbb19fc5b0a518095df
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision b4bc2e0337b358ee180650101d98e18346bf7c22)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 06a49a103e6c62257c56fdbb19fc5b0a518095df)
@@ -197,7 +197,7 @@
     SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER,
     SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL,
     SW_FAULT_ID_MODE_TREATMENT_INVALID_ALARM_ACTION,
-    SW_FAULT_ID_MODE_PRIME_RESERVOIR_MGMT_INVALID_STATE,
+    SW_FAULT_ID_MODE_PRE_TREATMENT_RESERVOIR_MGMT_INVALID_STATE,
     SW_FAULT_ID_DIALYSIS_INVALID_STATE,                                 // 55
     SW_FAULT_ID_DIALYSIS_INVALID_UF_STATE,
     SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,
@@ -259,6 +259,7 @@
     SW_FAULT_ID_HD_SYRINGE_INVALID_VREF,
     SW_FAULT_ID_HD_SYRINGE_INVALID_STATE,
     SW_FAULT_ID_MODE_POST_TREATMENT_INVALID_STATE,                      // 115
+    SW_FAULT_ID_POST_TREATMENT_RESERVOIR_MGMT_INVALID_STATE,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;