Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -r667feab319b14681a0330a715da7a1ba930b518d
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 24b2fe72608344e67ef37234085d15ad5e4fcc37)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
@@ -366,9 +366,11 @@
 
     if ( STATE_CLOSED == getFPGADoorState() )
     {
-#ifdef SKIP_UI_INTERACTION
-        patientDisconnectionConfirmed = TRUE;
-#endif
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
+        {
+            patientDisconnectionConfirmed = TRUE;
+        }
+
         if ( TRUE == patientDisconnectionConfirmed )
         {
             patientDisconnectionConfirmed = FALSE;
@@ -409,9 +411,10 @@
 {
     HD_POST_TREATMENT_STATE_T state = HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE;
 
-#ifdef SKIP_UI_INTERACTION
-    disposableRemovalConfirmed = TRUE;
-#endif
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
+    {
+        disposableRemovalConfirmed = TRUE;
+    }
 
     if ( TRUE == disposableRemovalConfirmed )
     {