diff --git a/bibtalk/bib-talk/UI/Login.xaml b/bibtalk/bib-talk/UI/Login.xaml
index 18df67c..1cb63a1 100644
--- a/bibtalk/bib-talk/UI/Login.xaml
+++ b/bibtalk/bib-talk/UI/Login.xaml
@@ -117,7 +117,7 @@
                          Margin="0,30,0,0"
                          Background="#FF323134"
                          Foreground="White"
-                         SelectionBrush="#FF6332A0"/>
+                         SelectionBrush="#FF6332A0" KeyDown="passwordbox_KeyDown"/>
                 <Button x:Name="weiterbutton" Content="Weiter" Foreground="Gray"  Background="#FF323134" BorderThickness="0" Margin="0,30,0,0" Height="30" BorderBrush="{x:Null}" Click="WeiterButton_Click" Style="{StaticResource NoHoverButtonStyle}"/>
                 <TextBlock Text="Noch keinen Account?"
                            Foreground="White"
diff --git a/bibtalk/bib-talk/UI/Login.xaml.cs b/bibtalk/bib-talk/UI/Login.xaml.cs
index f50d7a8..5b6ae82 100644
--- a/bibtalk/bib-talk/UI/Login.xaml.cs
+++ b/bibtalk/bib-talk/UI/Login.xaml.cs
@@ -2,6 +2,7 @@
 using System.Windows.Media;
 using System.Windows;
 using bib_talk.Business;
+using System.Windows.Controls;
 
 namespace bib_talk
 {
@@ -69,5 +70,16 @@ namespace bib_talk
             register.Show();
             this.Close();
         }
+
+        private void passwordbox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                if (usernbox.Text != "" && passwordbox.Password != "")
+                {
+                    loginManager.Login();
+                }
+            }
+        }
     }
 }
diff --git a/bibtalk/bib-talk/UI/MainWindow.xaml b/bibtalk/bib-talk/UI/MainWindow.xaml
index 62fdfa3..b298beb 100644
--- a/bibtalk/bib-talk/UI/MainWindow.xaml
+++ b/bibtalk/bib-talk/UI/MainWindow.xaml
@@ -154,7 +154,7 @@
                         <StackPanel Margin="5">
                             <TextBlock  Text="{Binding Username}" FontWeight="Bold" FontSize="20"/>
                             <TextBlock Text="{Binding Timestamp, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Foreground="Gray"/>
-                            <TextBlock TextWrapping="Wrap" Text="{Binding Text}" FontSize="16"/>
+                            <TextBlock TextWrapping="Wrap" Text="{Binding Text}" FontSize="16" Foreground="White"/>
 
                         </StackPanel>
 
@@ -172,7 +172,7 @@
                          Background="#FF323134"
                          Foreground="White"
                          SelectionBrush="#FF6332A0" KeyDown="messageBOX_KeyDown" Grid.ColumnSpan="4" Grid.Row="1"/>
-            <Button x:Name="weiterbutton" Click="send_Click" Content="Weiter" Foreground="White"  Background="#FF6332A0" BorderThickness="0" Margin="44,346,10,10" BorderBrush="{x:Null}" Style="{StaticResource NoHoverButtonStyle}" RenderTransformOrigin="0.279,0.633" Grid.Column="3" Grid.Row="1"/>
+            <Button x:Name="weiterbutton" Click="send_Click" Content="Weiter" Foreground="White"  Background="#FF6332A0" BorderThickness="0" Margin="44,346,10,0" BorderBrush="{x:Null}" Style="{StaticResource NoHoverButtonStyle}" RenderTransformOrigin="0.279,0.633" Grid.Column="3" Grid.Row="1"/>
             <Button x:Name="uplaodpb" Click="uploadpbclick" Content="Upload" Foreground="White"  Background="#FF6332A0" BorderThickness="0" Margin="10,351,574,5" BorderBrush="{x:Null}" Style="{StaticResource NoHoverButtonStyle}" RenderTransformOrigin="0.279,0.633" Grid.Row="1"/>