Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r37a8a58b766a496b39241dd7ae46dc10dbda35e4 -rbcabc6be0c3b6cc916d1c7f9b0983082834870ca
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 37a8a58b766a496b39241dd7ae46dc10dbda35e4)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision bcabc6be0c3b6cc916d1c7f9b0983082834870ca)
@@ -87,7 +87,7 @@
 
     // TODO - send POST status on CAN
 
-    // execute current POST state
+    // execute current POST state     *Note - these switch cases must be in same order as enum HD_POST_States
     switch ( postState )
     {
         case POST_STATE_START:
@@ -96,13 +96,17 @@
             postState = POST_STATE_COMPLETED;
 #endif
 #ifdef SKIP_POST
+#ifndef DISABLE_UI_TREATMENT_WORKFLOW
+            postState = POST_STATE_VALVES;
+#else
             postState = POST_STATE_COMPLETED;
 #endif
+#endif
             break;
 
         case POST_STATE_WATCHDOG:
             testStatus = execWatchdogTest();
-            postState = handlePOSTStatus( testStatus );  // ignoring return value because last test
+            postState = handlePOSTStatus( testStatus );
             break;
 
         case POST_STATE_ALARM_LAMP:
@@ -152,7 +156,7 @@
         // Should be last POST
         case POST_STATE_STUCK_BUTTON:
             testStatus = execStuckButtonTest();
-            handlePOSTStatus( testStatus );
+            handlePOSTStatus( testStatus );  // ignoring return value because last test
 
             if ( TRUE == tempPOSTPassed )
             {