Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r14d740bbb065f043daaa348bcda5f447e1c16a32 -r3662494c8f383acfe63a9fa09d9e1a63ec5c5aec
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 14d740bbb065f043daaa348bcda5f447e1c16a32)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3662494c8f383acfe63a9fa09d9e1a63ec5c5aec)
@@ -1445,6 +1445,8 @@
     MESSAGE_T msg;
     DG_VALVE_SETTING_CMD_REQUEST_T valveCmd;
 
+    valveCmd.valveSettingCmd = valveSettingCmd;
+
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_CHANGE_VALVE_SETTING_CMD_REQUEST;
@@ -1533,12 +1535,20 @@
     BOOL result;
     MESSAGE_T msg;
     DG_START_STOP_TX_CMD_REQUEST_T cmd;
+    cmd.acidType   = 0;
+    cmd.bicarbType = 0;
 
     cmd.start = start;
 
+    if ( TRUE == start )
+    {
+        cmd.acidType   = getTreatmentParameterU32( TREATMENT_PARAM_ACID_CONCENTRATE );
+        cmd.bicarbType = getTreatmentParameterU32( TREATMENT_PARAM_BICARB_CONCENTRATE );
+    }
+
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_STARTING_STOPPING_TREATMENT_CMD_REQUEST;
+    msg.hdr.msgID      = MSG_ID_STARTING_STOPPING_TREATMENT_CMD_REQUEST;
     msg.hdr.payloadLen = sizeof( DG_START_STOP_TX_CMD_REQUEST_T );
 
     memcpy( &msg.payload, &cmd, sizeof( DG_START_STOP_TX_CMD_REQUEST_T ) );
@@ -2063,16 +2073,7 @@
  *************************************************************************/
 void handleUICheckIn( MESSAGE_T *message )
 {
-
-    if ( message->hdr.payloadLen == sizeof( U32 ) )
-    {
-        checkInFromUI();
-    }
-
-    else
-    {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-    }
+    checkInFromUI();
 }
 
 /*********************************************************************//**