diff --git a/NebulaAuth/Core/DialogsController.cs b/NebulaAuth/Core/DialogsController.cs
index 349f7d8..fb9e70d 100644
--- a/NebulaAuth/Core/DialogsController.cs
+++ b/NebulaAuth/Core/DialogsController.cs
@@ -1,9 +1,11 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using MaterialDesignThemes.Wpf;
 using NebulaAuth.Model.Entities;
 using NebulaAuth.View;
 using NebulaAuth.View.Dialogs;
 using NebulaAuth.ViewModel.Other;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
 
 namespace NebulaAuth.Core;
 
@@ -36,7 +38,23 @@ public static async Task<bool> ShowConfirmCancelDialog(string? msg = null)
         {
             UserName = username
         };
-        var content = new LoginAgainDialog()
+        var content = new LoginAgainDialog
+        {
+            DataContext = vm
+        };
+        var result = await DialogHost.Show(content);
+        if (result is true)
+        {
+            return vm;
+        }
+
+        return null;
+    }
+
+    public static async Task<LoginAgainOnImportVM?> ShowLoginAgainOnImportDialog(Mafile mafile, IEnumerable<MaProxy> proxies)
+    {
+        var vm = new LoginAgainOnImportVM(mafile, proxies);
+        var content = new LoginAgainOnImportDialog()
         {
             DataContext = vm
         };
diff --git a/NebulaAuth/Core/UpdateManager.cs b/NebulaAuth/Core/UpdateManager.cs
index d6424ef..784fbec 100644
--- a/NebulaAuth/Core/UpdateManager.cs
+++ b/NebulaAuth/Core/UpdateManager.cs
@@ -1,7 +1,14 @@
 using AutoUpdaterDotNET;
+using MaterialDesignThemes.Wpf;
 using NebulaAuth.Model;
+using NebulaAuth.View;
+using NebulaAuth.ViewModel.Other;
 using System;
 using System.IO;
+using System.Net;
+using System.Windows.Forms;
+using System.Windows.Threading;
+using Application = System.Windows.Application;
 
 
 namespace NebulaAuth.Core;
@@ -17,8 +24,60 @@ public static void CheckForUpdates()
         if (Settings.Instance.AllowAutoUpdate)
             AutoUpdater.UpdateMode = Mode.ForcedDownload;
         AutoUpdater.Start(UPDATE_URL);
-       
+
 
     }
 
+
+    static UpdateManager()
+    {
+        //AutoUpdater.CheckForUpdateEvent += AutoUpdaterOnCheckForUpdateEvent;
+
+    }
+
+    private static async void AutoUpdaterOnCheckForUpdateEvent(UpdateInfoEventArgs args)
+    {
+        if (args.Error == null)
+        {
+            if (args.IsUpdateAvailable)
+            {
+                DialogResult dialogResult;
+                var dialog = new UpdaterView()
+                {
+                    DataContext = new UpdaterVM(args)
+                };
+
+                await DialogHost.Show(dialog);
+                Application.Current.Shutdown();
+
+            }
+            else
+            {
+
+            }
+        }
+        else
+        {
+            if (args.Error is WebException)
+            {
+
+            }
+            else
+            {
+
+            }
+        }
+
+    }
+
+    private static void RunUpdate(UpdateInfoEventArgs args)
+    {
+        Application.Current.Dispatcher.Invoke(() =>
+        {
+            if (AutoUpdater.DownloadUpdate(args))
+            {
+                Application.Current.Shutdown();
+            }
+        }, DispatcherPriority.ContextIdle);
+    }
 }
\ No newline at end of file
diff --git a/NebulaAuth/MainWindow.xaml b/NebulaAuth/MainWindow.xaml
index be104af..45b9b22 100644
--- a/NebulaAuth/MainWindow.xaml
+++ b/NebulaAuth/MainWindow.xaml
@@ -71,7 +71,7 @@
                         <ComboBox MinWidth="100" Margin="8,0,8,0" VerticalAlignment="Center" md:HintAssist.Hint="{Tr MainWindow.AppBar.GroupsHint}" md:TextFieldAssist.HasClearButton="True" IsEditable="True" ItemsSource="{Binding Groups}" SelectedValue="{Binding SelectedGroup}">
                             <FrameworkElement.Resources>
                                 <ResourceDictionary>
-                                    <Style TargetType="{x:Type md:PackIcon}">
+                                    <Style TargetType="md:PackIcon">
                                         <Setter Property="Width" Value="15" />
                                         <Setter Property="Height" Value="15" />
                                     </Style>
@@ -109,8 +109,8 @@
                             </UIElement.Visibility>
                         </md:PackIcon>
                         <md:PackIcon Kind="StopAlert" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="#FFFFA500" Margin="3" ToolTip="{Tr MainWindow.AppBar.Proxy.ProxyAlert.DefaultInUse}" ToolTipService.InitialShowDelay="600" Visibility="{Binding IsDefaultProxy, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                        <CheckBox FontSize="14" Style="{StaticResource MaterialDesignFilterChipAccentCheckBox}" IsChecked="{Binding TradeTimerEnabled}" Content="{Tr MainWindow.AppBar.TradeTimerHint}"/>
-                        <CheckBox FontSize="14" Style="{StaticResource MaterialDesignFilterChipAccentCheckBox}" IsChecked="{Binding MarketTimerEnabled}" Content="{Tr MainWindow.AppBar.MarketTimerHint}"/>
+                        <CheckBox FontSize="14" Style="{StaticResource MaterialDesignFilterChipSecondaryCheckBox}" IsChecked="{Binding TradeTimerEnabled}" Content="{Tr MainWindow.AppBar.TradeTimerHint}"/>
+                        <CheckBox FontSize="14" Style="{StaticResource MaterialDesignFilterChipSecondaryCheckBox}" IsChecked="{Binding MarketTimerEnabled}" Content="{Tr MainWindow.AppBar.MarketTimerHint}"/>
                         <TextBox w:FontScaleWindow.Scale="0.8" w:FontScaleWindow.ResizeFont="True" md:HintAssist.Hint="{Tr Common.Abbreviations.Time.Seconds}" Margin="10,0,0,0" MinWidth="30" Style="{StaticResource MaterialDesignFloatingHintTextBox}" Text="{Binding TimerCheckSeconds, UpdateSourceTrigger=PropertyChanged, Delay=700}" PreviewTextInput="UIElement_OnPreviewTextInput" />
                     </ToolBar>
                 </ToolBarTray>
diff --git a/NebulaAuth/NebulaAuth.csproj b/NebulaAuth/NebulaAuth.csproj
index a0fbbec..3a955b5 100644
--- a/NebulaAuth/NebulaAuth.csproj
+++ b/NebulaAuth/NebulaAuth.csproj
@@ -10,7 +10,7 @@
 	  <SatelliteResourceLanguages>en;ru;ua</SatelliteResourceLanguages>
 	  <ApplicationIcon>Theme\nebula lock.ico</ApplicationIcon>
 	  <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
-	  <AssemblyVersion>1.4.5</AssemblyVersion>
+	  <AssemblyVersion>1.4.6</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,7 +26,7 @@
 	  <PackageReference Include="CodingSebLocalization.Fody" Version="1.3.0" />
 	  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageReference Include="MaterialDesignColors" Version="2.1.4" />
-    <PackageReference Include="MaterialDesignExtensions" Version="3.3.0" />
+    <PackageReference Include="MaterialDesignExtensions" Version="4.0.0-a02" />
     <PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
     <PackageReference Include="NLog" Version="5.2.8" />
@@ -43,7 +43,6 @@
 
 	<ItemGroup>
     <Folder Include="Model\Exceptions\" />
-    <Folder Include="ViewModel\Other\" />
     <Folder Include="Utility\" />
   </ItemGroup>
 
@@ -51,6 +50,12 @@
 	  <ProjectReference Include="..\SteamLibForked\SteamLibForked.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Compile Update="View\Dialogs\LoginAgainOnImportDialog.xaml.cs">
+	    <SubType>Code</SubType>
+	  </Compile>
+	</ItemGroup>
+
 
   <ItemGroup>
     <None Update="NLog.config">
diff --git a/NebulaAuth/Theme/lock small-detailed.png b/NebulaAuth/Theme/lock small-detailed.png
new file mode 100644
index 0000000..a88ff31
Binary files /dev/null and b/NebulaAuth/Theme/lock small-detailed.png differ
diff --git a/NebulaAuth/View/Dialogs/LoginAgainDialog.xaml b/NebulaAuth/View/Dialogs/LoginAgainDialog.xaml
index 464abce..00af367 100644
--- a/NebulaAuth/View/Dialogs/LoginAgainDialog.xaml
+++ b/NebulaAuth/View/Dialogs/LoginAgainDialog.xaml
@@ -7,6 +7,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:other="clr-namespace:NebulaAuth.ViewModel.Other"
              xmlns:model="clr-namespace:NebulaAuth.Model"
+             xmlns:entities="clr-namespace:NebulaAuth.Model.Entities"
              mc:Ignorable="d" 
              d:DesignHeight="250" d:DesignWidth="800"
              theme:FontScaleWindow.Scale="0.9" theme:FontScaleWindow.ResizeFont="True"
@@ -15,25 +16,25 @@
              Background="{DynamicResource WindowBackground}">
 
     <Grid MinHeight="100" MinWidth="300"  Margin="20">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
         <TextBlock theme:FontScaleWindow.Scale="0.9" theme:FontScaleWindow.ResizeFont="True" Margin="10,0,0,0" HorizontalAlignment="Left">
             <Run Text="{Tr LoginAgainDialog.LoginFor, IsDynamic=False}"/>
             <Run FontWeight="Bold" Text="{Binding UserName}"/>
         </TextBlock>
-        <TextBox Text="{Binding Password}" Margin="10" Grid.Row="1" Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:HintAssist.Hint="{Tr LoginAgainDialog.PasswordBox}"></TextBox>
-        <CheckBox IsEnabled="{Binding Source={x:Static model:PHandler.IsPasswordSet}}" IsChecked="{Binding SavePassword}" Margin="10" Grid.Row="2" Content="{Tr LoginAgainDialog.SaveEncryptedPassword}"/>
-        <Grid Grid.Row="3">
+        <TextBox Text="{Binding Password}" Margin="10,10,10,0" Grid.Row="1" Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:HintAssist.Hint="{Tr LoginAgainDialog.PasswordBox}"></TextBox>
+        <CheckBox Grid.Row="2"  Margin="10,10,10,0"  IsEnabled="{Binding Source={x:Static model:PHandler.IsPasswordSet}}" IsChecked="{Binding SavePassword}" Content="{Tr LoginAgainDialog.SaveEncryptedPassword}"/>
+        <Grid Grid.Row="3" Margin="10,10,10,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <Button IsDefault="True" Margin="10,5,5,5"  Style="{StaticResource MaterialDesignOutlinedButton}" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" CommandParameter="{StaticResource True}" Content="{Tr LoginAgainDialog.LoginButton}"/>
-            <Button IsCancel="True" Grid.Column="1" Margin="5,5,10,5"  Style="{StaticResource MaterialDesignOutlinedButton}" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" CommandParameter="{StaticResource False}" Content="{Tr LoginAgainDialog.CancelButton}"/>
+            <Button IsDefault="True" Margin="0,0,5,5"  Style="{StaticResource MaterialDesignOutlinedButton}" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" CommandParameter="{StaticResource True}" Content="{Tr LoginAgainDialog.LoginButton}"/>
+            <Button IsCancel="True" Grid.Column="1" Margin="5,0,0,5"  Style="{StaticResource MaterialDesignOutlinedButton}" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" CommandParameter="{StaticResource False}" Content="{Tr LoginAgainDialog.CancelButton}"/>
         </Grid>
     </Grid>
 </UserControl>
diff --git a/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml b/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml
new file mode 100644
index 0000000..328113e
--- /dev/null
+++ b/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml
@@ -0,0 +1,50 @@
+<UserControl x:Class="NebulaAuth.View.Dialogs.LoginAgainOnImportDialog"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:theme="clr-namespace:NebulaAuth.Theme"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:other="clr-namespace:NebulaAuth.ViewModel.Other"
+             xmlns:model="clr-namespace:NebulaAuth.Model"
+             xmlns:entities="clr-namespace:NebulaAuth.Model.Entities"
+             mc:Ignorable="d" 
+             d:DesignHeight="250" d:DesignWidth="800"
+             theme:FontScaleWindow.Scale="0.9" theme:FontScaleWindow.ResizeFont="True"
+             Foreground="WhiteSmoke" Cursor="Hand"
+             d:DataContext="{d:DesignInstance other:LoginAgainOnImportVM}"
+             Background="{DynamicResource WindowBackground}">
+
+    <Grid MinHeight="100" MinWidth="300"  Margin="20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <TextBlock theme:FontScaleWindow.Scale="0.9" theme:FontScaleWindow.ResizeFont="True" Margin="10,0,0,0" HorizontalAlignment="Left">
+            <Run Text="{Tr LoginAgainDialog.LoginFor, IsDynamic=False}"/>
+            <Run FontWeight="Bold" Text="{Binding UserName}"/>
+        </TextBlock>
+        <TextBox Text="{Binding Password}" Margin="10,10,10,0" Grid.Row="1" Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:HintAssist.Hint="{Tr LoginAgainDialog.PasswordBox}"></TextBox>
+        <ComboBox Grid.Row="2" Margin="10,10,10,0" materialDesign:HintAssist.Hint="{Tr Common.Proxy}" ItemsSource="{Binding Proxies}" SelectedItem="{Binding SelectedProxy}" >
+            <ItemsControl.ItemTemplate>
+                <DataTemplate DataType="{x:Type entities:MaProxy}">
+                    <TextBlock Text="{Binding Converter={StaticResource ProxyTextConverter}, Mode=OneWay}" />
+                </DataTemplate>
+            </ItemsControl.ItemTemplate> 
+        </ComboBox>
+        <CheckBox Grid.Row="3"  Margin="10,10,10,0"  IsEnabled="{Binding Source={x:Static model:PHandler.IsPasswordSet}}" IsChecked="{Binding SavePassword}" Content="{Tr LoginAgainDialog.SaveEncryptedPassword}"/>
+        <CheckBox Grid.Row="4" Margin="10,10,10,0" IsEnabled="{Binding  MafileHasProxy}" Content="{Tr LoginAgainDialog.UseMafileProxy}" IsChecked="{Binding UseMafileProxy}"/>
+        <Grid Grid.Row="5" Margin="10,0,10,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Button IsDefault="True" Margin="0,5,5,5"  Style="{StaticResource MaterialDesignOutlinedButton}" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" CommandParameter="{StaticResource True}" Content="{Tr LoginAgainDialog.LoginButton}"/>
+            <Button IsCancel="True" Grid.Column="1" Margin="5,5,0,5"  Style="{StaticResource MaterialDesignOutlinedButton}" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" CommandParameter="{StaticResource False}" Content="{Tr LoginAgainDialog.CancelButton}"/>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml.cs b/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml.cs
new file mode 100644
index 0000000..56b2ab0
--- /dev/null
+++ b/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace NebulaAuth.View.Dialogs
+{
+    /// <summary>
+    /// Логика взаимодействия для LoginAgainDialog.xaml
+    /// </summary>
+    public partial class LoginAgainOnImportDialog
+    {
+        public LoginAgainOnImportDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/NebulaAuth/View/UpdaterView.xaml b/NebulaAuth/View/UpdaterView.xaml
new file mode 100644
index 0000000..be17e6b
--- /dev/null
+++ b/NebulaAuth/View/UpdaterView.xaml
@@ -0,0 +1,58 @@
+<UserControl x:Class="NebulaAuth.View.UpdaterView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:NebulaAuth.View"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:other="clr-namespace:NebulaAuth.ViewModel.Other"
+             xmlns:wpf="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
+             mc:Ignorable="d" 
+             d:DesignHeight="700" 
+             d:DesignWidth="500" 
+             Foreground="WhiteSmoke"
+             FontFamily="{materialDesign:MaterialDesignFont}"
+             d:DataContext="{d:DesignInstance other:UpdaterVM}"
+             Background="{DynamicResource WindowBackground}"
+             Padding="10"
+             MaxWidth="500">
+    <d:DesignerProperties.DesignStyle>
+        <Style TargetType="UserControl">
+            <Setter Property="Background" Value="{DynamicResource WindowBackground}" />
+        </Style>
+    </d:DesignerProperties.DesignStyle>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <TextBlock FontSize="24" Text="Обновления"/>
+        <Separator Grid.Row="1"></Separator>
+
+        <TextBlock FontSize="16" Margin="5,10,0,10" TextWrapping="WrapWithOverflow" Grid.Row="2" >
+            <Run Text="Доступна новая версия:"/>
+            <Run FontWeight="Bold" Text="{Binding UpdateInfoEventArgs.CurrentVersion}"/>
+            <Run Text="&#x0a;Вы используете версию"/>
+            <Run FontWeight="Bold" Text="{Binding UpdateInfoEventArgs.InstalledVersion}"/>
+            <Run Text="Хотите обновить программу?"/>
+        </TextBlock>
+        <Expander Header="Что изменилось?" Grid.Row="3">
+            <!--<wpf:WebView2  HorizontalAlignment="Stretch" Height="300"
+            Source="{Binding UpdateInfoEventArgs.ChangelogURL}"
+        />-->
+        </Expander>
+        <Grid Grid.Row="4">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Button Content="OK"  Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" />
+            <Button IsCancel="True" Grid.Column="1" Content="Cancel"  Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" />
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/NebulaAuth/View/UpdaterView.xaml.cs b/NebulaAuth/View/UpdaterView.xaml.cs
new file mode 100644
index 0000000..04363ed
--- /dev/null
+++ b/NebulaAuth/View/UpdaterView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace NebulaAuth.View
+{
+    /// <summary>
+    /// Логика взаимодействия для UpdaterView.xaml
+    /// </summary>
+    public partial class UpdaterView : UserControl
+    {
+        public UpdaterView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/NebulaAuth/ViewModel/MainVM.cs b/NebulaAuth/ViewModel/MainVM.cs
index e000bd5..d9d42e6 100644
--- a/NebulaAuth/ViewModel/MainVM.cs
+++ b/NebulaAuth/ViewModel/MainVM.cs
@@ -73,6 +73,7 @@ public async Task LoginAgain()
         {
             return;
         }
+     
         var password = loginAgainVm.Password;
         var waitDialog = new WaitLoginDialog();
         var wait = DialogHost.Show(waitDialog);
diff --git a/NebulaAuth/ViewModel/MainVM_File.cs b/NebulaAuth/ViewModel/MainVM_File.cs
index d115f86..0ff2080 100644
--- a/NebulaAuth/ViewModel/MainVM_File.cs
+++ b/NebulaAuth/ViewModel/MainVM_File.cs
@@ -15,6 +15,8 @@
 using AchiesUtilities.Extensions;
 using NebulaAuth.Model.Entities;
 using SteamLib.Exceptions;
+using NebulaAuth.Utility;
+using NebulaAuth.View.Dialogs;
 
 namespace NebulaAuth.ViewModel;
 
@@ -127,24 +129,47 @@ public async Task AddMafile(string[] path)
 
     private async Task<bool> HandleAddMafileWithoutSession(Mafile data)
     {
-        var oldMafile = SelectedMafile;
-        SelectedMafile = data;
-        await LoginAgain();
-        var result = data.SessionData != null;
-        if (result)
+        var loginAgainVm = await DialogsController.ShowLoginAgainOnImportDialog(data, Proxies);
+        if (loginAgainVm == null)
         {
-            var existed = MaFiles.FirstOrDefault(m => m.AccountName == data.AccountName); //TODO: more elegant way to handle overwrite
-            if (existed != null)
-            {
-                MaFiles.Remove(existed);
-            }
-            MaFiles.Add(data);
-            SelectedMafile = data;
+            return false;
+        }
+
+        var password = loginAgainVm.Password;
+        if (!loginAgainVm.UseMafileProxy)
+        {
+            data.Proxy = loginAgainVm.SelectedProxy;
+        }
+        var waitDialog = new WaitLoginDialog();
+        var wait = DialogHost.Show(waitDialog);
+        try
+        {
+            await MaClient.LoginAgain(data, password, loginAgainVm.SavePassword, waitDialog);
+            SnackbarController.SendSnackbar(GetLocalizationOrDefault("SuccessfulLogin"));
         }
-        else
+        catch (LoginException ex)
         {
-            SelectedMafile = oldMafile;
+            SnackbarController.SendSnackbar(ErrorTranslatorHelper.TranslateLoginError(ex.Error), TimeSpan.FromSeconds(1.5));
         }
+        catch (Exception ex)
+            when (ExceptionHandler.Handle(ex))
+        {
+            Shell.Logger.Error(ex);
+        }
+        finally
+        {
+            DialogsController.CloseDialog();
+            await wait;
+        }
+        var result = data.SessionData != null;
+        if (!result) return result;
+        var existed = MaFiles.FirstOrDefault(m => m.AccountName == data.AccountName); //TODO: more elegant way to handle overwrite
+        if (existed != null)
+        {
+            MaFiles.Remove(existed);
+        }
+        MaFiles.Add(data);
+        SelectedMafile = data;
         return result;
 
     }
diff --git a/NebulaAuth/ViewModel/Other/LoginAgainOnImportVM.cs b/NebulaAuth/ViewModel/Other/LoginAgainOnImportVM.cs
new file mode 100644
index 0000000..a5e9c86
--- /dev/null
+++ b/NebulaAuth/ViewModel/Other/LoginAgainOnImportVM.cs
@@ -0,0 +1,54 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using NebulaAuth.Model.Entities;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace NebulaAuth.ViewModel.Other;
+
+public partial class LoginAgainOnImportVM : ObservableObject
+{
+    public ObservableCollection<MaProxy> Proxies { get; } = new();
+    [ObservableProperty] private string _password = null!;
+    [ObservableProperty] private bool _savePassword;
+    [ObservableProperty] private string _userName = null!;
+    [ObservableProperty] private bool _mafileHasProxy;
+
+    public MaProxy? SelectedProxy
+    {
+        get => _selectedProxy;
+        set
+        {
+            if (SetProperty(ref _selectedProxy, value) && value != null)
+            {
+                UseMafileProxy = false;
+            }
+        }
+    }
+    public bool UseMafileProxy
+    {
+        get => _useMafileProxy;
+        set
+        {
+            if (SetProperty(ref _useMafileProxy, value) && value)
+            {
+                SelectedProxy = null;
+            }
+        }
+    }
+
+
+
+
+    private MaProxy? _selectedProxy;
+    private bool _useMafileProxy;
+    public LoginAgainOnImportVM(Mafile mafile, IEnumerable<MaProxy> proxies)
+    {
+        UserName = mafile.AccountName;
+        MafileHasProxy = mafile.Proxy != null;
+        UseMafileProxy = MafileHasProxy;
+        Proxies = new(proxies);
+    }
+
+    public LoginAgainOnImportVM()
+    { }
+}
\ No newline at end of file
diff --git a/NebulaAuth/ViewModel/Other/LoginAgainVM.cs b/NebulaAuth/ViewModel/Other/LoginAgainVM.cs
index a9c07b6..597d0c5 100644
--- a/NebulaAuth/ViewModel/Other/LoginAgainVM.cs
+++ b/NebulaAuth/ViewModel/Other/LoginAgainVM.cs
@@ -1,4 +1,9 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using CommunityToolkit.Mvvm.ComponentModel;
+using NebulaAuth.Model;
+using NebulaAuth.Model.Entities;
 
 namespace NebulaAuth.ViewModel.Other;
 
@@ -7,4 +12,7 @@ public partial class LoginAgainVM : ObservableObject
     [ObservableProperty] private string _password = null!;
     [ObservableProperty] private bool _savePassword;
     [ObservableProperty] private string _userName = null!;
+
+    public LoginAgainVM()
+    { }
 }
\ No newline at end of file
diff --git a/NebulaAuth/ViewModel/Other/UpdaterVM.cs b/NebulaAuth/ViewModel/Other/UpdaterVM.cs
new file mode 100644
index 0000000..83fc9cd
--- /dev/null
+++ b/NebulaAuth/ViewModel/Other/UpdaterVM.cs
@@ -0,0 +1,15 @@
+using AutoUpdaterDotNET;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.VisualBasic.FileIO;
+
+namespace NebulaAuth.ViewModel.Other;
+
+public partial class UpdaterVM : ObservableObject
+{
+
+    public UpdateInfoEventArgs UpdateInfoEventArgs { get; }
+    public UpdaterVM(UpdateInfoEventArgs args)
+    {
+        UpdateInfoEventArgs = args;
+    }
+}
\ No newline at end of file
diff --git a/NebulaAuth/localization.loc.json b/NebulaAuth/localization.loc.json
index 44fb823..cb801db 100644
--- a/NebulaAuth/localization.loc.json
+++ b/NebulaAuth/localization.loc.json
@@ -35,6 +35,11 @@
       "ru": "Отменено",
       "ua": "Скасовано"
     },
+    "Proxy": {
+      "en": "Proxy",
+      "ru": "Прокси",
+      "ua": "Проксі"
+    },
     "Abbreviations": {
       "Time": {
         "Seconds": {
@@ -85,7 +90,7 @@
         "Caption": {
           "en": "Account",
           "ru": "Аккаунт",
-          "ua": "Аккаунт"
+          "ua": "Акаунт"
         },
         "Link": {
           "en": "Link",
@@ -174,7 +179,7 @@
       "Account": {
         "en": "Account: ",
         "ru": "Аккаунт: ",
-        "ua": "Аккаунт: "
+        "ua": "Акаунт: "
       },
       "Group": {
         "en": "Group: ",
@@ -267,7 +272,7 @@
     "DisableTimersOnSwitch": {
       "en": "Disable timers on account switch",
       "ru": "Отключать таймеры при смене аккаунта",
-      "ua": "Вимикати таймери при зміні аккаунта"
+      "ua": "Вимикати таймери при зміні акаунта"
     },
     "MinimizeToTray": {
       "en": "Minimize to tray",
@@ -342,6 +347,11 @@
       "en": "Save encrypted password to mafile",
       "ru": "Сохранить зашифрованный пароль в мафайл",
       "ua": "Зберегти зашифрований пароль в мафайлі"
+    },
+    "UseMafileProxy": {
+      "en": "Use mafile proxy",
+      "ru": "Использовать прокси из мафайла",
+      "ua": "Використовувати проксі з мафайла"
     }
   },
   "ProxyManagerDialog": {
@@ -626,7 +636,7 @@
         "AccountNotFound": {
           "ru": "Аккаунт не найден (18)",
           "en": "Account not found (18)",
-          "ua": "Аккаунт не знайдено (18)"
+          "ua": "Акаунт не знайдено (18)"
         },
         "InvalidSteamID": {
           "ru": "Неправильный SteamID (19)",
@@ -661,7 +671,7 @@
         "AccountDisabled": {
           "ru": "Аккаунт отключен (43)",
           "en": "Account disabled (43)",
-          "ua": "Аккаунт відключено (43)"
+          "ua": "Акаунт відключено (43)"
 
         },
         "Suspended": {
@@ -684,7 +694,7 @@
         "AccountLockedDown": {
           "ru": "Аккаунт заблокирован (КТ 73)",
           "en": "Account locked down (73)",
-          "ua": "Аккаунт заблоковано (КТ 73)"
+          "ua": "Акаунт заблоковано (КТ 73)"
 
         },
         "UnexpectedError": {
@@ -732,7 +742,7 @@
         "AccountLimitExceeded": {
           "ru": "Лимит аккаунта превышен (95)",
           "en": "Account limit exceeded (95)",
-          "ua": "Ліміт аккаунта перевищено (95)"
+          "ua": "Ліміт акаунта перевищено (95)"
 
         },
         "EmailSendFailure": {
@@ -756,12 +766,12 @@
         "LimitedUserAccount": {
           "ru": "Аккаунт с лимитом (112)",
           "en": "Limited user account (112)",
-          "ua": "Аккаунт з лімітом (112)"
+          "ua": "Акаунт з лімітом (112)"
         },
         "AccountDeleted": {
           "ru": "Аккаунт удален (114)",
           "en": "Account deleted (114)",
-          "ua": "Аккаунт видалено (114)"
+          "ua": "Акаунт видалено (114)"
 
         },
         "PhoneNumberIsVOIP": {
diff --git a/NebulaAuth/update.xml b/NebulaAuth/update.xml
index 0e0f26a..1d492aa 100644
--- a/NebulaAuth/update.xml
+++ b/NebulaAuth/update.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-	<version>1.4.5.0</version>
-	<url>https://github.com/achiez/NebulaAuth-Steam-Desktop-Authenticator-by-Achies/releases/download/1.4.5/NebulaAuth.1.4.5.zip</url>
-	<changelog>https://achiez.github.io/NebulaAuth-Steam-Desktop-Authenticator-by-Achies/changelog/1.4.5.html</changelog>
+	<version>1.4.6.0</version>
+	<url>https://github.com/achiez/NebulaAuth-Steam-Desktop-Authenticator-by-Achies/releases/download/1.4.6/NebulaAuth.1.4.6.zip</url>
+	<changelog>https://achiez.github.io/NebulaAuth-Steam-Desktop-Authenticator-by-Achies/changelog/1.4.6.html</changelog>
 	<mandatory>false</mandatory>
 </item>
\ No newline at end of file