diff --git a/Borepin/Borepin/Page/AddServerProcess/AuthPlainPage.xaml b/Borepin/Borepin/Page/AddServerProcess/AuthPlainPage.xaml
index f014ab3..9c4b58a 100644
--- a/Borepin/Borepin/Page/AddServerProcess/AuthPlainPage.xaml
+++ b/Borepin/Borepin/Page/AddServerProcess/AuthPlainPage.xaml
@@ -16,7 +16,7 @@
             </StackLayout>
             <StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}">
                 <Label Text="Username" Style="{StaticResource Style_Label_Property_Title}"></Label>
-                <Entry Text="{Binding Username}"/>
+                <Entry Text="{Binding Username}" IsSpellCheckEnabled="false"/>
 
                 <Label Text="Password" Style="{StaticResource Style_Label_Property_Title}"></Label>
                 <Entry Text="{Binding Password}" IsPassword="True"/>
diff --git a/Borepin/Borepin/Page/AddServerProcess/SelectServerPage.xaml b/Borepin/Borepin/Page/AddServerProcess/SelectServerPage.xaml
index d80b2c5..ed588ac 100644
--- a/Borepin/Borepin/Page/AddServerProcess/SelectServerPage.xaml
+++ b/Borepin/Borepin/Page/AddServerProcess/SelectServerPage.xaml
@@ -16,7 +16,7 @@
             </StackLayout>
             <StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}">
                 <Label Text="Host" Style="{StaticResource Style_Label_Property_Title}"></Label>
-                <Entry Text="{Binding Server}"/>
+                <Entry Text="{Binding Server}" Keyboard="Url" IsSpellCheckEnabled="false"/>
                 <Button Text="Connect to Server" Command="{Binding ConnectToServerCommand}" Style="{StaticResource Style_Button_Primary}"/>
                 <Button Text="Scan QR-Code" Command="{Binding ScanCodeCommand}" Style="{StaticResource Style_Button_Primary}">
                     <Button.IsVisible>
diff --git a/Borepin/Borepin/Page/ServerListPage.xaml b/Borepin/Borepin/Page/ServerListPage.xaml
index 1f590a0..5b59f46 100644
--- a/Borepin/Borepin/Page/ServerListPage.xaml
+++ b/Borepin/Borepin/Page/ServerListPage.xaml
@@ -8,6 +8,7 @@
     <ContentPage.Resources>
         <ResourceDictionary>
             <converters:InvertBoolConverter x:Key="InvertBoolConverter"/>
+            <converters:ListNotEmptyConverter x:Key="ListNotEmptyConverter"/>
         </ResourceDictionary>
     </ContentPage.Resources>
     <ContentPage.Content>
@@ -20,7 +21,7 @@
                 <StackLayout IsVisible="{Binding HasActiveConnection}">
                     <views:ServerListItemView BindingContext="{Binding ActiveConnection}" MinimumHeightRequest="50"/>
                 </StackLayout>
-                <Label Text="Last Connections"/>
+                <Label Text="Last Connections" IsVisible="{Binding ServerListItemViewModel_List, Converter={StaticResource ListNotEmptyConverter}}"/>
                 <ListView ItemsSource="{Binding ServerListItemViewModel_List}" SelectionMode="None" SeparatorColor="Transparent" VerticalOptions="StartAndExpand">
                     <ListView.ItemTemplate>
                         <DataTemplate>