diff -r 9881453a49b3 -r daf2d9d6fa18 www/js/rec_edit.js
--- a/www/js/rec_edit.js	Sat Feb 02 11:53:39 2019 +0100
+++ b/www/js/rec_edit.js	Sat Feb 02 14:57:41 2019 +0100
@@ -1066,20 +1066,32 @@
 			calcWater();
 		});
 		$('#wa_cacl2').on('change', function (event) {
-			setWaterAgent('CaCl2', event.args.value);
-			calcWater();
+			if (event.args) {
+				setWaterAgent('CaCl2', 0);	// This can prevent double entries.
+				setWaterAgent('CaCl2', event.args.value);
+				calcWater();
+			}
 		});
 		$('#wa_caso4').on('change', function (event) {
-			setWaterAgent('CaSO4', event.args.value);
-			calcWater();
+			if (event.args) {
+				setWaterAgent('CaSO4', 0);
+				setWaterAgent('CaSO4', event.args.value);
+				calcWater();
+			}
 		});
 		$('#wa_mgso4').on('change', function (event) {
-			setWaterAgent('MgSO4', event.args.value);
-			calcWater();
+			if (event.args) {
+				setWaterAgent('MgSO4', 0);
+				setWaterAgent('MgSO4', event.args.value);
+				calcWater();
+			}
 		});
 		$('#wa_nacl').on('change', function (event) {
-			setWaterAgent('NaCl', event.args.value);
-			calcWater();
+			if (event.args) {
+				setWaterAgent('NaCl', 0);
+				setWaterAgent('NaCl', event.args.value);
+				calcWater();
+			}
 		});
 		$('#wa_base_name').on('change', function (event) {
 			if (event.args) {
@@ -3040,6 +3052,8 @@
 				row["step_name"] = data.step_name;
 				row["step_type"] = data.step_type;
 				// For now, but this must be smarter.
+				if (mash_infuse == 0 && dataRecord.w1_amount > 0)
+					mash_infuse = dataRecord.w1_amount;
 				if (i == 0)
 					row["step_infuse_amount"] = mash_infuse;
 				else