diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml b/Elwig/Windows/DeliveryAdminWindow.xaml
index 118a66e..4f64ab8 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml
@@ -325,7 +325,7 @@
 
                 <CheckBox x:Name="LesewagenInput" Content="Lesewagen" Margin="10,75,0,0" Grid.Column="2"
                           VerticalAlignment="Top" HorizontalAlignment="Left"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+                          Checked="LesewagenInput_Changed" Unchecked="LesewagenInput_Changed"/>
                 <CheckBox x:Name="HandPickedInput" Content="Handlese" Margin="10,105,0,0" Grid.Column="2" IsThreeState="True"
                           VerticalAlignment="Top" HorizontalAlignment="Left"
                           Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
index 5be8dee..751b4b3 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -1109,7 +1109,24 @@ namespace Elwig.Windows {
         }
 
         private void ModifiersInput_SelectionChanged(object sender, ItemSelectionChangedEventArgs evt) {
+            if ((IsEditing || IsCreating) && App.Client.Client == ClientParameters.Type.Matzen) {
+                var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
+                var kl = mod.Where(m => m.Name.StartsWith("Klasse "));
+                if (kl.Count() > 1) {
+                    foreach (var r in kl.Take(kl.Count() - 1)) ModifiersInput.SelectedItems.Remove(r);
+                }
+            }
+        }
 
+        private void LesewagenInput_Changed(object sender, RoutedEventArgs evt) {
+            if ((IsEditing || IsCreating) && App.Client.Client == ClientParameters.Type.Matzen) {
+                var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
+                var kl = mod.Where(m => m.Name.StartsWith("Klasse ")).Select(m => m.ModId).LastOrDefault("A")[0];
+                if (LesewagenInput.IsChecked == true) kl++; else kl--;
+                var newKl = ModifiersInput.ItemsSource.Cast<Modifier>().Where(m => m.ModId == kl.ToString()).FirstOrDefault();
+                if (newKl != null) ModifiersInput.SelectedItems.Add(newKl);
+            }
+            CheckBox_Changed(sender, evt);
         }
 
         private void UpdateWineOrigin() {