diff --git a/project/Aki.Launcher/ViewModels/LoginViewModel.cs b/project/Aki.Launcher/ViewModels/LoginViewModel.cs
index 4f7160a..2db7c41 100644
--- a/project/Aki.Launcher/ViewModels/LoginViewModel.cs
+++ b/project/Aki.Launcher/ViewModels/LoginViewModel.cs
@@ -11,6 +11,7 @@ using Splat;
 using System.Collections.ObjectModel;
 using System.Reactive;
 using System.Threading.Tasks;
+using Avalonia.Threading;
 
 namespace Aki.Launcher.ViewModels
 {
@@ -111,12 +112,11 @@ namespace Aki.Launcher.ViewModels
             //handle auto-login
             if (LauncherSettingsProvider.Instance.UseAutoLogin && LauncherSettingsProvider.Instance.Server.AutoLoginCreds != null && !NoAutoLogin)
             {
-                Task.Run(() =>
+                Login = LauncherSettingsProvider.Instance.Server.AutoLoginCreds;
+                Dispatcher.UIThread.InvokeAsync(() =>
                 {
-                    Login = LauncherSettingsProvider.Instance.Server.AutoLoginCreds;
                     LoginCommand.Execute();
                 });
-
                 return;
             }