diff --git a/CTZLauncher/MainWindow.xaml b/CTZLauncher/MainWindow.xaml
index e1ce63c..839b891 100644
--- a/CTZLauncher/MainWindow.xaml
+++ b/CTZLauncher/MainWindow.xaml
@@ -51,9 +51,9 @@
                     <Grid>
                         <Grid Margin="10,10,10,0" Height="174" VerticalAlignment="Top">
                             <Label Content="————— 游 戏 帐 号 —————" VerticalAlignment="Top" Margin="10,0" HorizontalContentAlignment="Center" FontSize="15"/>
-                            <TextBox x:Name="username" Template="{StaticResource CornerTextBox}" Height="34" TextWrapping="Wrap" Text="" VerticalAlignment="Top" HorizontalContentAlignment="Center" FontFamily="微软雅黑" FontSize="20" Margin="30,30,30,0" />
+                            <TextBox x:Name="username" Template="{StaticResource CornerTextBox}" Height="34" TextWrapping="Wrap" Text="" VerticalAlignment="Top" HorizontalContentAlignment="Center" FontFamily="微软雅黑" FontSize="20" Margin="30,30,30,0" KeyDown="username_KeyDown" />
                             <Label Content="————— 游 戏 密 码 —————" VerticalAlignment="Top" Margin="10,69,10,0" HorizontalContentAlignment="Center" FontSize="15"/>
-                            <TextBox x:Name="password" Template="{StaticResource CornerTextBox}" TextWrapping="Wrap" HorizontalContentAlignment="Center" FontFamily="微软雅黑" FontSize="20" Margin="30,104,30,0" Height="34" VerticalAlignment="Top" Tag="{}{&quot;areas&quot;:[{&quot;name&quot;:&quot;\u7eaf\u51c0\u5927\u533a&quot;,&quot;servers&quot;:[{&quot;name&quot;:&quot;\u5149\u677f\u5c0f\u9547&quot;,&quot;address&quot;:&quot;CityCraft.cn&quot;,&quot;port&quot;:25565,&quot;info&quot;:&quot;\u7eaf\u51c0\u670d\u52a1\u5668&quot;,&quot;version&quot;:&quot;1.8-Forge&quot;,&quot;url&quot;:&quot;CityCraft.cn&quot;}]},{&quot;name&quot;:&quot;\u6a21\u7ec4\u5927\u533a&quot;,&quot;servers&quot;:[{&quot;name&quot;:&quot;\u5149\u677f\u5c0f\u9547&quot;,&quot;address&quot;:&quot;CityCraft.cn&quot;,&quot;port&quot;:25573,&quot;info&quot;:&quot;MOD\u670d\u52a1\u5668: \u8c46\u8150 \u5bb6\u5177 &quot;,&quot;version&quot;:&quot;1.7.10-Forge&quot;,&quot;url&quot;:&quot;CityCraft.cn&quot;}]}]}" />
+                            <TextBox x:Name="password" Template="{StaticResource CornerTextBox}" TextWrapping="Wrap" HorizontalContentAlignment="Center" FontFamily="微软雅黑" FontSize="20" Margin="30,104,30,0" Height="34" VerticalAlignment="Top" Tag="{}{&quot;areas&quot;:[{&quot;name&quot;:&quot;\u7eaf\u51c0\u5927\u533a&quot;,&quot;servers&quot;:[{&quot;name&quot;:&quot;\u5149\u677f\u5c0f\u9547&quot;,&quot;address&quot;:&quot;CityCraft.cn&quot;,&quot;port&quot;:25565,&quot;info&quot;:&quot;\u7eaf\u51c0\u670d\u52a1\u5668&quot;,&quot;version&quot;:&quot;1.8-Forge&quot;,&quot;url&quot;:&quot;CityCraft.cn&quot;}]},{&quot;name&quot;:&quot;\u6a21\u7ec4\u5927\u533a&quot;,&quot;servers&quot;:[{&quot;name&quot;:&quot;\u5149\u677f\u5c0f\u9547&quot;,&quot;address&quot;:&quot;CityCraft.cn&quot;,&quot;port&quot;:25573,&quot;info&quot;:&quot;MOD\u670d\u52a1\u5668: \u8c46\u8150 \u5bb6\u5177 &quot;,&quot;version&quot;:&quot;1.7.10-Forge&quot;,&quot;url&quot;:&quot;CityCraft.cn&quot;}]}]}" KeyDown="password_KeyDown" />
                             <Button x:Name="forget" Margin="217,106,33,0" Template="{StaticResource CornerButton}" Height="30" Content="?" VerticalAlignment="Top" />
                         </Grid>
                         <Grid Margin="10,0,10,10" Height="50" VerticalAlignment="Bottom">
diff --git a/CTZLauncher/MainWindow.xaml.cs b/CTZLauncher/MainWindow.xaml.cs
index b5ef378..718cbc5 100644
--- a/CTZLauncher/MainWindow.xaml.cs
+++ b/CTZLauncher/MainWindow.xaml.cs
@@ -96,7 +96,7 @@ namespace CTZLauncher
                     }
                     else
                     {
-                        ServerWindow.Visibility = System.Windows.Visibility.Visible;
+                        ServerWindow.Visibility = Visibility.Visible;
                         RotateTransform rtf = new RotateTransform();
                         ServerWindow.RenderTransform = rtf;
                         LoginWindow.RenderTransform = rtf;
@@ -271,5 +271,17 @@ namespace CTZLauncher
             Console.WriteLine(log);
         }
         #endregion
+
+        private void username_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+                password.Focus();
+        }
+
+        private void password_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+                Login_Click(sender, e);
+        }
     }
 }