diff --git a/src/WPFEduSolution/WPFBeginner/ViewModels/LoginWindowViewModel.cs b/src/WPFEduSolution/WPFBeginner/ViewModels/LoginWindowViewModel.cs
index bd3b7a4..f84adf0 100644
--- a/src/WPFEduSolution/WPFBeginner/ViewModels/LoginWindowViewModel.cs
+++ b/src/WPFEduSolution/WPFBeginner/ViewModels/LoginWindowViewModel.cs
@@ -32,6 +32,6 @@ namespace WPFBeginner.ViewModels
 
         private bool CheckID() => user?.Equals(App.Config.Login.User, StringComparison.OrdinalIgnoreCase) ?? false;
 
-        private bool CheckPassword() => user?.Equals(App.Config.Login.User, StringComparison.OrdinalIgnoreCase) ?? false;
+        private bool CheckPassword() => password?.Equals(App.Config.Login.Password, StringComparison.OrdinalIgnoreCase) ?? false;
     }
 }
diff --git a/src/WPFEduSolution/WPFBeginner/ViewModels/MainWindowViewModel.cs b/src/WPFEduSolution/WPFBeginner/ViewModels/MainWindowViewModel.cs
index 186acc2..f05f002 100644
--- a/src/WPFEduSolution/WPFBeginner/ViewModels/MainWindowViewModel.cs
+++ b/src/WPFEduSolution/WPFBeginner/ViewModels/MainWindowViewModel.cs
@@ -185,9 +185,10 @@ namespace WPFBeginner.ViewModels
             OnPropertyChanged(nameof(Members));
         });
 
-        public ICommand AddClickCommand => new RelayCommand(() =>
+        public ICommand AddClickCommand => new RelayCommand<Window>((parentWindow) =>
         {
             var registDialog = new RegistMemberWindow();
+            registDialog.Owner = parentWindow;
             var result = registDialog.ShowDialog();
             if (result == true)
             {
diff --git a/src/WPFEduSolution/WPFBeginner/Views/LoginWindow.xaml b/src/WPFEduSolution/WPFBeginner/Views/LoginWindow.xaml
index 379837e..478c7bf 100644
--- a/src/WPFEduSolution/WPFBeginner/Views/LoginWindow.xaml
+++ b/src/WPFEduSolution/WPFBeginner/Views/LoginWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:vm="clr-namespace:WPFBeginner.ViewModels"
         xmlns:sv="clr-namespace:WPFBeginner.Services"
         Background="Transparent" AllowsTransparency="True"
-        WindowStyle="None" Name="root"
+        WindowStyle="None" Name="root" WindowStartupLocation="CenterScreen"
         mc:Ignorable="d" Height="436" Width="720">
 
     <Window.DataContext>
@@ -34,7 +34,7 @@
     </Window.Resources>
 
     <Window.Clip>
-        <RectangleGeometry Rect="0,0,720,436" RadiusX="25" RadiusY="25"/>
+        <RectangleGeometry Rect="0,0,720,436" RadiusX="15" RadiusY="15"/>
     </Window.Clip>
 
     <Border Background="Transparent">
diff --git a/src/WPFEduSolution/WPFBeginner/Views/MainWindow.xaml b/src/WPFEduSolution/WPFBeginner/Views/MainWindow.xaml
index 58355e2..4b5b450 100644
--- a/src/WPFEduSolution/WPFBeginner/Views/MainWindow.xaml
+++ b/src/WPFEduSolution/WPFBeginner/Views/MainWindow.xaml
@@ -136,7 +136,7 @@
 
             <Grid>
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="10 5">
-                    <Button Content="{DynamicResource Cultures.MainWindow.Button.Add}" Style="{DynamicResource DataGridEditButtonStyle}" Command="{Binding AddClickCommand}"/>
+                    <Button Content="{DynamicResource Cultures.MainWindow.Button.Add}" Style="{DynamicResource DataGridEditButtonStyle}" Command="{Binding AddClickCommand}" CommandParameter="{Binding ElementName=root}"/>
                     <Button Content="{DynamicResource Cultures.MainWindow.Button.Delete}" Style="{DynamicResource DataGridEditButtonStyle}" Command="{Binding DeleteClickCommand}"/>
                     <Button Content="{DynamicResource Cultures.MainWindow.Button.Init}" Style="{DynamicResource DataGridEditButtonStyle}" Command="{Binding InitClickCommand}"/>
                 </StackPanel>