diff --git a/bibtalk/bib-talk/UI/Login.xaml b/bibtalk/bib-talk/UI/Login.xaml
index 1cb63a1..a4d6c58 100644
--- a/bibtalk/bib-talk/UI/Login.xaml
+++ b/bibtalk/bib-talk/UI/Login.xaml
@@ -101,7 +101,7 @@
                          Margin="0,30,0,0"
                          Background="#FF323134"
                          Foreground="White"
-                         SelectionBrush="#FF6332A0"/>
+                         SelectionBrush="#FF6332A0" KeyDown="usernbox_KeyDown"/>
 
                 <!-- Benutzername TextBox -->
                 <TextBlock Text="Passwort"
diff --git a/bibtalk/bib-talk/UI/Login.xaml.cs b/bibtalk/bib-talk/UI/Login.xaml.cs
index 5b6ae82..3f1dfb8 100644
--- a/bibtalk/bib-talk/UI/Login.xaml.cs
+++ b/bibtalk/bib-talk/UI/Login.xaml.cs
@@ -70,6 +70,13 @@ namespace bib_talk
             register.Show();
             this.Close();
         }
+        private void usernbox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                passwordbox.Focus();
+            }
+        }
 
         private void passwordbox_KeyDown(object sender, KeyEventArgs e)
         {
diff --git a/bibtalk/bib-talk/UI/RegisterWindow.xaml b/bibtalk/bib-talk/UI/RegisterWindow.xaml
index 3ee0e62..d898b9c 100644
--- a/bibtalk/bib-talk/UI/RegisterWindow.xaml
+++ b/bibtalk/bib-talk/UI/RegisterWindow.xaml
@@ -142,7 +142,7 @@
                          Margin="0,30,0,0"
                          Background="#FF323134"
                          Foreground="White"
-                         SelectionBrush="#FF6332A0"/>
+                         SelectionBrush="#FF6332A0" KeyDown="emailbox_KeyDown"/>
 
                 <!-- Benutzername TextBox -->
                 <TextBlock Text="Benutzername"
@@ -157,7 +157,7 @@
                          Margin="0,30,0,0"
                          Background="#FF323134"
                          Foreground="White"
-                         SelectionBrush="#FF6332A0"/>
+                         SelectionBrush="#FF6332A0" KeyDown="usernbox_KeyDown"/>
 
                 <!-- Passwort PasswordBox -->
                 <TextBlock Text="Passwort"
@@ -172,7 +172,7 @@
                              Margin="0,30,0,0"
                              Background="#FF323134"
                              Foreground="White"
-                             SelectionBrush="#FF6332A0"/>
+                             SelectionBrush="#FF6332A0" KeyDown="passwordbox_KeyDown"/>
 
                 <!-- Geburtsdatum Text -->
                 <TextBlock Text="Geburtsdatum"
@@ -187,7 +187,7 @@
                              BorderBrush="Transparent"
                              Background="#FF323134"
                              Foreground="White"
-                             SelectionBrush="#FF6332A0"/>
+                             SelectionBrush="#FF6332A0" KeyDown="bday1_KeyDown"/>
                     <TextBox Width="100"
                              Height="30"
                              FontSize="20"
@@ -195,7 +195,7 @@
                              BorderBrush="Transparent"
                              Background="#FF323134"
                              Foreground="White"
-                             SelectionBrush="#FF6332A0"/>
+                             SelectionBrush="#FF6332A0" KeyDown="bday2_KeyDown"/>
                     <TextBox Width="100"
                              Height="30"
                              FontSize="20"
diff --git a/bibtalk/bib-talk/UI/RegisterWindow.xaml.cs b/bibtalk/bib-talk/UI/RegisterWindow.xaml.cs
index 2a8a8a3..21de0aa 100644
--- a/bibtalk/bib-talk/UI/RegisterWindow.xaml.cs
+++ b/bibtalk/bib-talk/UI/RegisterWindow.xaml.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Text.RegularExpressions;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Navigation;
@@ -120,7 +121,44 @@ namespace bib_talk
 
             return true;
         }
+        private void emailbox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                usernbox.Focus();
+            }
+        }
+        private void usernbox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                passwordbox.Focus();
+            }
+        }
 
+        private void passwordbox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                bday1.Focus();
+            }
+        }
+        private void bday1_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                bday2.Focus();  
+            }
+        }
 
-	}
+        private void bday2_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                bday3.Focus();
+            }
+        }
+
+       
+    }
 }