diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
index a6be751..4984c27 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -162,7 +162,7 @@ namespace Elwig.Windows {
             if (!IsUpdatingGradation) {
                 if (valid) UpdateGradationKmw();
                 else if (GradationOeInput.Text.Length == 0) GradationKmwInput.Text = "";
-                UpdateWineQualityLevels();
+                if (valid || GradationOeInput.Text.Length == 0) UpdateWineQualityLevels();
             }
         }
 
@@ -175,11 +175,12 @@ namespace Elwig.Windows {
             if (!IsUpdatingGradation) {
                 if (valid) UpdateGradationOe();
                 else if (GradationKmwInput.Text.Length == 0) GradationOeInput.Text = "";
-                UpdateWineQualityLevels();
+                if (valid || GradationKmwInput.Text.Length == 0) UpdateWineQualityLevels();
             }
         }
 
         private void GradationKmwInput_LostFocus(object sender, RoutedEventArgs evt) {
+            if (GradationKmwInput.Text.EndsWith(",")) GradationKmwInput.Text += "0";
             InputLostFocus((TextBox)sender, Validator.CheckGradationKmw);
             if (GradationKmwInput.Text.Length != 0 && !GradationKmwInput.Text.Contains(','))
                 GradationKmwInput.Text += ",0";