diff --git a/TBF/UI/Procedures/TestWizard/FlowSelection.cs b/TBF/UI/Procedures/TestWizard/FlowSelection.cs
index 694659bd9..110a43562 100644
--- a/TBF/UI/Procedures/TestWizard/FlowSelection.cs
+++ b/TBF/UI/Procedures/TestWizard/FlowSelection.cs
@@ -62,7 +62,8 @@ namespace TBF.UI.Procedures.TestWizard
             this.selectorValues = selectorValues;
 
             flowUnit = test.FlowUnit;
-            unitComboBox.Text = unit2ComboBox.Text = unit3ComboBox.Text = flowUnit.ToDescription();
+            unitComboBox.Text = unit2ComboBox.Text = unit3ComboBox.Text =
+                (flowUnit == Unit.None) ? Unit.m3ph.ToDescription() : flowUnit.ToDescription();
 
             if (first) backButton.Visible = false;
 
diff --git a/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs b/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs
index 82967864b..31dff9886 100644
--- a/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs
+++ b/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs
@@ -54,7 +54,7 @@ namespace TBF.UI.Procedures.TestWizard
 			this.test = test;
 
             volumeUnit = test.VolumeUnit;
-            unitComboBox.Text = volumeUnit.ToDescription();
+            unitComboBox.Text = (volumeUnit == Unit.None) ? Unit.l.ToDescription() : volumeUnit.ToDescription();
 
 			if (first) backButton.Visible = false;
 			if (last) nextButton.Text = Strings.FinishBtnText;