diff --git a/Elwig/Helpers/ClientParameters.cs b/Elwig/Helpers/ClientParameters.cs
index b68a1b0..af56656 100644
--- a/Elwig/Helpers/ClientParameters.cs
+++ b/Elwig/Helpers/ClientParameters.cs
@@ -14,6 +14,8 @@ namespace Elwig.Helpers {
         public bool IsWolkersdorf => Client == Type.Winzerkeller && App.ZwstId == "W";
         public bool IsHaugsdorf => Client == Type.Winzerkeller && App.ZwstId == "H";
         public bool IsSitzendorf => Client == Type.Winzerkeller && App.ZwstId == "S";
+        public bool HasRebler => IsMatzen || IsWolkersdorf;
+        public bool HasKisten => IsHaugsdorf || IsSitzendorf;
 
         public string NameToken;
         public string NameShort;
diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml b/Elwig/Windows/DeliveryAdminWindow.xaml
index d10bc79..72f7d2a 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml
@@ -327,7 +327,7 @@
 
                     <CheckBox x:Name="GerebeltGewogenInput" Content="Gerebelt gewogen"
                               VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
-                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+                              Checked="GerebeltGewogenInput_Changed" Unchecked="GerebeltGewogenInput_Changed"/>
 
                     <Button x:Name="WeighingAButton" Content="Wiegen A" Width="120"
                             Click="WeighingButton_Click"
@@ -383,7 +383,7 @@
                               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"/>
+                              Checked="HandPickedInput_Changed" Unchecked="HandPickedInput_Changed"/>
                 </Grid>
             </GroupBox>
 
diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
index 485958f..78dd73a 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -217,8 +217,7 @@ namespace Elwig.Windows {
             ClearOriginalValues();
             ClearDefaultValues();
 
-            HandPickedInput.IsChecked = null;
-            if (App.Client.IsMatzen || App.Client.IsWolkersdorf) {
+            if (App.Client.HasRebler) {
                 GerebeltGewogenInput.IsChecked = true;
                 GerebeltGewogenInput.IsEnabled = false;
                 SetDefaultValue(GerebeltGewogenInput);
@@ -227,6 +226,23 @@ namespace Elwig.Windows {
                 GerebeltGewogenInput.IsEnabled = true;
                 UnsetDefaultValue(GerebeltGewogenInput);
             }
+
+            if (App.Client.HasKisten) {
+                LesewagenInput.IsChecked = false;
+                LesewagenInput.IsEnabled = false;
+                SetDefaultValue(LesewagenInput);
+                HandPickedInput.IsThreeState = false;
+                HandPickedInput.IsChecked = true;
+                UnsetDefaultValue(HandPickedInput);
+            } else {
+                LesewagenInput.IsChecked = false;
+                LesewagenInput.IsEnabled = true;
+                UnsetDefaultValue(LesewagenInput);
+                HandPickedInput.IsThreeState = true;
+                HandPickedInput.IsChecked = null;
+                SetDefaultValue(HandPickedInput);
+            }
+
             if (App.Client.IsMatzen || App.Client.IsWinzerkeller) {
                 GebundenInput.IsChecked = null;
                 GebundenInput.IsEnabled = false;
@@ -238,8 +254,6 @@ namespace Elwig.Windows {
             }
 
             WineQualityLevelInput.IsEnabled = false;
-
-            SetDefaultValue(HandPickedInput);
             ValidateRequiredInputs();
         }
 
@@ -1587,5 +1601,19 @@ namespace Elwig.Windows {
             }
             InputLostFocus(tb, Validator.CheckDecimal(tb, false, 2, 1));
         }
+
+        private void GerebeltGewogenInput_Changed(object sender, RoutedEventArgs evt) {
+            if (App.Client.HasKisten) {
+                HandPickedInput.IsChecked = !GerebeltGewogenInput.IsChecked;
+            }
+            CheckBox_Changed(sender, evt);
+        }
+
+        private void HandPickedInput_Changed(object sender, RoutedEventArgs evt) {
+            if (App.Client.HasKisten) {
+                GerebeltGewogenInput.IsChecked = !HandPickedInput.IsChecked;
+            }
+            CheckBox_Changed(sender, evt);
+        }
     }
 }