diff --git a/UtopiaCanteen.Client/ViewModels/ClientSettingsViewModel.cs b/UtopiaCanteen.Client/ViewModels/ClientSettingsViewModel.cs
index a700874..6321e2d 100644
--- a/UtopiaCanteen.Client/ViewModels/ClientSettingsViewModel.cs
+++ b/UtopiaCanteen.Client/ViewModels/ClientSettingsViewModel.cs
@@ -222,11 +222,12 @@ public partial class ClientSettingsViewModel : ObservableObject
_configService.SetScanIntervalMinutes(minutes);
_configService.SetScanIntervalSeconds(seconds);
_configService.SetAdminCardId(AdminCardId?.Trim() ?? string.Empty);
- FileLogger.Info(
- "ClientSettings",
- $"Settings saved. AdminCardId={AdminCardId?.Trim()}, SiteId={SiteId?.Trim()}, DeviceId={DeviceId?.Trim()}");
_configService.SetCentralServerBaseUrl(BackendBaseUrl.Trim());
_configService.SetDeviceId(DeviceId?.Trim() ?? string.Empty);
+ DeviceId = _configService.GetDeviceId();
+ FileLogger.Info(
+ "ClientSettings",
+ $"Settings saved. AdminCardId={AdminCardId?.Trim()}, SiteId={SiteId?.Trim()}, DeviceId={DeviceId}");
var site = SiteId?.Trim() ?? string.Empty;
_configService.SetSiteId(
string.IsNullOrEmpty(site)
diff --git a/UtopiaCanteen.Client/Views/ClientSettingsView.xaml b/UtopiaCanteen.Client/Views/ClientSettingsView.xaml
index 5d7ac5b..54392ce 100644
--- a/UtopiaCanteen.Client/Views/ClientSettingsView.xaml
+++ b/UtopiaCanteen.Client/Views/ClientSettingsView.xaml
@@ -72,275 +72,323 @@
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+