diff --git a/TBF/Resources/Strings.Designer.cs b/TBF/Resources/Strings.Designer.cs
index 0e044fde3..3095e6a7b 100644
--- a/TBF/Resources/Strings.Designer.cs
+++ b/TBF/Resources/Strings.Designer.cs
@@ -1105,7 +1105,7 @@ namespace TBF.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Control water temp..
+        ///   Looks up a localized string similar to Water temp. control.
         /// </summary>
         internal static string Control_water_temp_chdr {
             get {
diff --git a/TBF/Resources/Strings.resx b/TBF/Resources/Strings.resx
index bcf19c997..5aebb9aa1 100644
--- a/TBF/Resources/Strings.resx
+++ b/TBF/Resources/Strings.resx
@@ -1733,7 +1733,7 @@
     <value>Save</value>
   </data>
   <data name="Control_water_temp_chdr" xml:space="preserve">
-    <value>Control water temp.</value>
+    <value>Water temp. control</value>
   </data>
   <data name="Temp_lim_hi_chdr" xml:space="preserve">
     <value>Temp. lim. hi</value>
diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs
index 988a07650..5b75f27f7 100644
--- a/TBF/UI/Procedures/ProcedureDlg.cs
+++ b/TBF/UI/Procedures/ProcedureDlg.cs
@@ -49,6 +49,7 @@ namespace TBF.UI.Procedures
 		public IList<IRegValve> RegulValves;
 		public IList<ITestMethod> TestMethods;
 		public IList<ITestMethod> UsedTestMethods;
+        public IList<ITempControl> TempControllers;
 		ComboBox methodCBox;
 
 		/// Auxiliary private lists
@@ -150,6 +151,7 @@ namespace TBF.UI.Procedures
 				Valves = Rig.BuiltIn.ValveBase.GetMasterValves(TbfComponents);
 				RegulValves = new List<IRegValve>();
 				TestMethods = new List<ITestMethod>();
+                TempControllers = new List<ITempControl>();
 				dataEntryComboBox.Items.Add("---");
 				printer1ComboBox.Items.Add("---");
                 printer2ComboBox.Items.Add("---");
@@ -166,7 +168,8 @@ namespace TBF.UI.Procedures
 				{
 					if (cmpnt is IRegValve) RegulValves.Add(cmpnt as IRegValve);
 					if (cmpnt is ITestMethod) TestMethods.Add(cmpnt as ITestMethod);
-					if (cmpnt is IDataEntry) dataEntryComboBox.Items.Add(cmpnt.Cfg.Name);
+                    if (cmpnt is ITempControl) TempControllers.Add(cmpnt as ITempControl);
+                    if (cmpnt is IDataEntry) dataEntryComboBox.Items.Add(cmpnt.Cfg.Name);
                     if (cmpnt is IResultsPrinter)
                     {
                         printer1ComboBox.Items.Add(cmpnt.Cfg.Name);
@@ -1211,7 +1214,7 @@ namespace TBF.UI.Procedures
             TempLimLo,
             TempLimHi,
             TempUnit,
-            ControlWaterTemp,
+            TempControl,
 			ShortPulses,
 			Publish,
 			Evaluate,
@@ -1245,9 +1248,9 @@ namespace TBF.UI.Procedures
                 if (Units.IsTemperature(u)) tempUnitBox.Items.Add(u.ToDescription());
             }
 
-            ComboBox yesNo2CBox = new ComboBox();   /// control for Control water temp.
-			yesNo2CBox.Items.Add(Strings.yes);
-			yesNo2CBox.Items.Add(Strings.no);
+            ComboBox tempControlBox = new ComboBox();   /// control for Control water temp.
+            tempControlBox.Items.Add("---");
+            foreach (var tc in TempControllers) tempControlBox.Items.Add(tc.Name);
 
             ComboBox yesNo3CBox = new ComboBox();   /// control for Evaluate
 			yesNo3CBox.Items.Add(Strings.yes);
@@ -1260,7 +1263,7 @@ namespace TBF.UI.Procedures
 					new TextBox(),      /// Temp.Lim. -
 					new TextBox(),      /// Temp.Lim. +
                     tempUnitBox,
-					yesNo2CBox,			/// Control water temp.
+					tempControlBox,     /// Water temp. control
 					new TextBox(),      /// Short pulses
 					publishCBox,		/// Publish
 					yesNo3CBox,			/// Evaluate
@@ -1294,7 +1297,7 @@ namespace TBF.UI.Procedures
             lvi.SubItems.Add(Units.ConvertTo(test.TempUnit, test.TempLimLo).ToString());
             lvi.SubItems.Add(Units.ConvertTo(test.TempUnit, test.TempLimHi).ToString());
             lvi.SubItems.Add(test.TempUnit.ToDescription());
-            lvi.SubItems.Add(test.DoControlWaterTemp ? Strings.yes : Strings.no);
+            lvi.SubItems.Add(string.IsNullOrEmpty(test.TempControl) ? "---" : test.TempControl);
             lvi.SubItems.Add(test.ShortPulses.ToString());
             lvi.SubItems.Add(((Publish)test.Publish).ToDescription());
             lvi.SubItems.Add(test.DoEvaluate ? Strings.yes : Strings.no);
@@ -1315,7 +1318,9 @@ namespace TBF.UI.Procedures
                     entity.ItemNr = i;
                     entity.Name = lvi.SubItems[(int)Mtrlgy2Clmn.Name].Text;
                     entity.Part = lvi.SubItems[(int)Mtrlgy2Clmn.Part].Text.Equals("-") ? 0 : int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.Part].Text);
-                    entity.DoControlWaterTemp = lvi.SubItems[(int)Mtrlgy2Clmn.ControlWaterTemp].Text.Equals(Strings.yes);
+                    entity.TempControl = lvi.SubItems[(int)Mtrlgy2Clmn.TempControl].Text.Equals("---")
+                                          ? string.Empty
+                                          : lvi.SubItems[(int)Mtrlgy2Clmn.TempControl].Text;
                     entity.ShortPulses = int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.ShortPulses].Text);
                     entity.DoEvaluate = lvi.SubItems[(int)Mtrlgy2Clmn.Evaluate].Text.Equals(Strings.yes);
 
@@ -1441,7 +1446,7 @@ namespace TBF.UI.Procedures
                     if (uint.TryParse(e.DisplayText, out udummy)) return;
                     break;
 
-                case Mtrlgy2Clmn.ControlWaterTemp:
+                case Mtrlgy2Clmn.TempControl:
                 case Mtrlgy2Clmn.Publish:
                 case Mtrlgy2Clmn.Evaluate:
                     /// Combo boxes