diff --git a/ClientApp/Views/LoginView.xaml b/ClientApp/Views/LoginView.xaml
index 6dc238e..ed554b4 100644
--- a/ClientApp/Views/LoginView.xaml
+++ b/ClientApp/Views/LoginView.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:ClientApp.Views"
              xmlns:viewModels="clr-namespace:ClientApp.ViewModels"
-      xmlns:Util="clr-namespace:Util.WPF"
+      xmlns:Util="clr-namespace:Util.MagicCode"
              mc:Ignorable="d" 
       ShowsNavigationUI="False"
              d:DesignHeight="450" d:DesignWidth="800">
@@ -17,8 +17,8 @@
             <Label Content="Username" HorizontalContentAlignment="Center" />
             <TextBox x:Name="Username" Text="{Binding Username}" TextWrapping="Wrap" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True" />
             <Label Content="Password" HorizontalContentAlignment="Center"/>
-            <PasswordBox x:Name="Password" Width="120"/>
-            <Button x:Name="Login" Content="Login" Command="{Binding LoginCommand}" CommandParameter="{Binding ElementName=Password}" Margin="0,20,0,0" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True"/>
+            <PasswordBox x:Name="Password" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True"/>
+            <Button x:Name="Login" Content="Login" Command="{Binding LoginCommand}" CommandParameter="{Binding ElementName=Password}" Margin="0,20,0,0" Width="120"/>
             <Popup IsOpen="{Binding InvertedLoginStatus}" PopupAnimation = "Slide" HorizontalAlignment="Center">
                 <Label Content="Login failed" Foreground="Red" HorizontalAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent"/>
             </Popup>
diff --git a/DoctorApp/Views/LoginView.xaml b/DoctorApp/Views/LoginView.xaml
index 144d10d..15c1bd0 100644
--- a/DoctorApp/Views/LoginView.xaml
+++ b/DoctorApp/Views/LoginView.xaml
@@ -5,6 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:DoctorApp.Views"
       xmlns:viewModels="clr-namespace:DoctorApp.ViewModels"
+                   xmlns:Util="clr-namespace:Util.MagicCode"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       >
@@ -12,9 +13,9 @@
     <DockPanel>
         <StackPanel VerticalAlignment="Center" Width="auto">
             <Label Content="Username" HorizontalContentAlignment="Center" />
-            <TextBox x:Name="Username" Text="{Binding Username}" TextWrapping="Wrap" Width="120"/>
+            <TextBox x:Name="Username" Text="{Binding Username}" TextWrapping="Wrap" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True"/>
             <Label Content="Password" HorizontalContentAlignment="Center"/>
-            <PasswordBox x:Name="Password" Width="120"/>
+            <PasswordBox x:Name="Password" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True"/>
             <Button x:Name="Login" Content="Login" Command="{Binding LoginCommand}" CommandParameter="{Binding ElementName=Password}" Margin="0,20,0,0" Width="120"/>
             <Popup IsOpen="{Binding InvertedLoginStatus}" PopupAnimation = "Fade" HorizontalAlignment="Left">
                 <Label Content="Login failed" Foreground="Red" Background="#FFFF" />
diff --git a/Hashing/WPFStuff/MagicCode/FocusAdvancement.cs b/Hashing/WPFStuff/MagicCode/FocusAdvancement.cs
index 1f34e44..16ebeea 100644
--- a/Hashing/WPFStuff/MagicCode/FocusAdvancement.cs
+++ b/Hashing/WPFStuff/MagicCode/FocusAdvancement.cs
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace Util.WPF
+namespace Util.MagicCode
 {
     public static class FocusAdvancement
     {