diff --git a/LANCommander.Playnite.Extension/LANCommanderLibraryPlugin.cs b/LANCommander.Playnite.Extension/LANCommanderLibraryPlugin.cs
index 26364db..d88a998 100644
--- a/LANCommander.Playnite.Extension/LANCommanderLibraryPlugin.cs
+++ b/LANCommander.Playnite.Extension/LANCommanderLibraryPlugin.cs
@@ -144,7 +144,10 @@ namespace LANCommander.PlaynitePlugin
             window.Title = "Authenticate to LANCommander";
 
             window.Content = new Views.Authentication(this);
-            window.DataContext = new ViewModels.Authentication();
+            window.DataContext = new ViewModels.Authentication()
+            {
+                ServerAddress = Settings.ServerAddress
+            };
 
             window.Owner = PlayniteApi.Dialogs.GetCurrentAppWindow();
             window.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterOwner;
diff --git a/LANCommander.Playnite.Extension/Views/LANCommanderSettingsView.xaml.cs b/LANCommander.Playnite.Extension/Views/LANCommanderSettingsView.xaml.cs
index 3728d09..146f06d 100644
--- a/LANCommander.Playnite.Extension/Views/LANCommanderSettingsView.xaml.cs
+++ b/LANCommander.Playnite.Extension/Views/LANCommanderSettingsView.xaml.cs
@@ -39,6 +39,7 @@ namespace LANCommander.PlaynitePlugin
             PART_AuthenticateLabel.Content = "Checking authentication status...";
             PART_AuthenticationButton.IsEnabled = false;
             PART_AuthenticateLabel.Content = Settings.InstallDirectory;
+
             var token = new AuthToken()
             {
                 AccessToken = Settings.AccessToken,