diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
index 4984c27..a32c3ad 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -2,7 +2,6 @@ using Elwig.Helpers;
 using Elwig.Models;
 using Microsoft.EntityFrameworkCore;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
@@ -33,14 +32,14 @@ namespace Elwig.Windows {
             Timer = new DispatcherTimer();
             Timer.Tick += new EventHandler(OnSecondPassed);
             Timer.Interval = new TimeSpan(0, 0, 1);
-            Timer.Start();
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs evt) {
-
+            OnSecondPassed(null, null);
+            Timer.Start();
         }
 
-        private void OnSecondPassed(object? sender, EventArgs evt) {
+        private void OnSecondPassed(object? sender, EventArgs? evt) {
             var now = DateTime.Now;
             TimeInput.Text = now.ToString("HH:mm");
             DateInput.Text = now.ToString("dd.MM.yyyy");
@@ -66,6 +65,7 @@ namespace Elwig.Windows {
             if (WineKgInput.SelectedItem == null) WineKgInput.SelectedIndex = 0;
             UpdateWineQualityLevels();
             UpdateRdInput();
+            await UpdateLsNr();
         }
 
         private void MgNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
@@ -91,13 +91,17 @@ namespace Elwig.Windows {
             }
         }
 
-        private void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
+        private async Task UpdateLsNr() {
             var branch = (Branch)BranchInput.SelectedItem;
             var date = DateOnly.ParseExact(DateInput.Text, "dd.MM.yyyy");
-            var lnr = Context.NextLNr(date).GetAwaiter().GetResult();
+            var lnr = await Context.NextLNr(date);
             LsNrInput.Text = $"{date:yyyyMMdd}{branch.ZwstId}{lnr:000}";
         }
 
+        private void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            UpdateLsNr().GetAwaiter().GetResult();
+        }
+
         private void UpdateWineVariety(bool valid) {
             if (valid) {
                 var text = SortIdInput.Text;