Index: sources/view/VTreatmentCreate.cpp
===================================================================
diff -u -ra631df5b4ae818e351d8b8332bbe1e760f7de888 -rcc7aae88f15228ff37b840946818692e444718bf
--- sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision a631df5b4ae818e351d8b8332bbe1e760f7de888)
+++ sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision cc7aae88f15228ff37b840946818692e444718bf)
@@ -63,9 +63,9 @@
     data.mHeparinDispensingRate             = _heparinDispensingRate           ;
     data.mHeparinBolusVolume                = _heparinBolusVolume              ;
 
-    emit didAdjustment(data);
     parametersConfirmed(false);
     parametersValidated(false);
+    emit didAdjustment(data);
 }
 
 /**
@@ -77,9 +77,8 @@
 void VTreatmentCreate::doConfirm() {
     AdjustParametersConfirmRequestData  confirmTreatmentRequest;
     confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eConfirm;
-    emit didAdjustment(confirmTreatmentRequest);
     parametersConfirmed(true);
-
+    emit didAdjustment(confirmTreatmentRequest);
 }
 
 /**
@@ -91,8 +90,9 @@
 {
     AdjustParametersConfirmRequestData  confirmTreatmentRequest;
     confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eCancel;
-    emit didAdjustment(confirmTreatmentRequest);
     parametersValidated(false);
+    parametersConfirmed(false);
+    emit didAdjustment(confirmTreatmentRequest);
 }
 
 /**
@@ -135,13 +135,12 @@
         rinsebackVolumeRejectReason                 (data.mRinsebackVolumeRejectReason                  );
         trancembrncPressureLimitWindowRejectReason  (data.mTrancembrncPressureLimitWindowRejectReason   );
 
-        emit didValidationFail();
         parametersValidated(false);
     }
     else {
         if ( _txCode.isEmpty()) { generateTxCode(); }
-        emit didValidationPass();
         parametersValidated(true);
+        emit didValidationPass();
     }
 }