Index: sources/view/VTreatmentCreate.cpp
===================================================================
diff -u -r0d59385f134f65a19dace1e2b46eb2631924396e -r9e234daa89b49df33be6faeaa597e6592526b539
--- sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision 0d59385f134f65a19dace1e2b46eb2631924396e)
+++ sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision 9e234daa89b49df33be6faeaa597e6592526b539)
@@ -239,7 +239,7 @@
 
     bool success = true;
     if (data.bloodFlowRate != Gui::GuiRequestReasons::REQUEST_REJECT_REASON_NONE) {
-        if (success) emit scrollToParameter(GET_VARIABLE_NAME(data.bloodFlowRate));
+        emit scrollToParameter(GET_VARIABLE_NAME(data.bloodFlowRate));
         success = false;
         emit bloodFlowRate_ValidationFailed(enumToString(static_cast<GuiRequestReasons>(data.bloodFlowRate)));
     }
@@ -370,15 +370,14 @@
     switch (pageToShow)
     {
         case None: {
+        // coco begin validated: Has been manually validated
             if (forward) {
                 pageToShow = CreateTreatment;
                 emit showCreate();
             }
-            else {
-                emit pop();
-            }
             break;
         }
+// coco end
         case CreateTreatment: {
             if (forward) {
                 pageToShow = ConfirmTreatment;
@@ -421,11 +420,13 @@
             }
             break;
         }
+        // coco begin validated: This has been validated manually.
         default: {
-            LOG_DEBUG("Invalid current page.");
+            LOG_EVENT("Invalid current page.");
         }
     }
 }
+// coco end
 
 /**
  * \brief VCreateTreatment::onFinishedConfirm
@@ -837,11 +838,11 @@
     QString aConcentrate;
     QString bCarbConcentrate;
     QString dType;
-    if ((acidConcentrateOptions().length() - 1 < (int)_acidConcentrate) || ((int)_acidConcentrate < 0))
+    if ((acidConcentrateOptions().length() - 1 < (int)_acidConcentrate))
         aConcentrate = "None";
     else
         aConcentrate = acidConcentrateOptions().at(acidConcentrate());
-    if ((bicarbonateConcentrateOptions().length() - 1 < (int)_bicarbonateConcentrate) || ((int)_bicarbonateConcentrate < 0))
+    if ((bicarbonateConcentrateOptions().length() - 1 < (int)_bicarbonateConcentrate))
         bCarbConcentrate = "None";
     else
         bCarbConcentrate = bicarbonateConcentrateOptions().at(bicarbonateConcentrate());