diff --git a/Elwig/Windows/ChartWindow.xaml b/Elwig/Windows/ChartWindow.xaml
index 5e1332f..7a0a71d 100644
--- a/Elwig/Windows/ChartWindow.xaml
+++ b/Elwig/Windows/ChartWindow.xaml
@@ -101,7 +101,7 @@
             </ListBox.ItemTemplate>
         </ListBox>
 
-        <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False"
+        <Button x:Name="SaveButton" Content="Speichern &amp; Berechnen" IsEnabled="False"
             HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="10,5,35,10" Grid.Column="0" Grid.Row="2"
             Click="SaveButton_Click"/>
 
diff --git a/Elwig/Windows/ChartWindow.xaml.cs b/Elwig/Windows/ChartWindow.xaml.cs
index bc81b7e..5548488 100644
--- a/Elwig/Windows/ChartWindow.xaml.cs
+++ b/Elwig/Windows/ChartWindow.xaml.cs
@@ -651,6 +651,12 @@ namespace Elwig.Windows {
                     ctx.Update(PaymentVar);
                     await ctx.SaveChangesAsync();
                 }
+                try {
+                    var b = new BillingVariant(PaymentVar.Year, PaymentVar.AvNr);
+                    await b.Calculate();
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                 LockContext = false;
                 App.HintContextChange();
             } catch (Exception exc) {