diff --git a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
index 5210450..20ae9e9 100644
--- a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
@@ -61,7 +61,7 @@
         <Label Content="{x:Static p:Resources.textBerthRemarks}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" />
         <TextBox x:Name="textBoxBerthRemarks" Grid.Column="1" Grid.Row="4" Margin="2" Grid.RowSpan="2" VerticalContentAlignment="Top" AcceptsReturn="True" MaxLength="512"/>
         <Label Content="{x:Static p:Resources.textDraft}" Grid.Column="0" Grid.Row="6" HorizontalContentAlignment="Right" />
-        <xctk:DoubleUpDown x:Name="doubleUpDownDraft" Grid.Column="1" Grid.Row="6" Margin="2" FormatString="N2" Minimum="0" Maximum="50"/>
+        <xctk:DoubleUpDown x:Name="doubleUpDownDraft" Grid.Column="1" Grid.Row="6" Margin="2" FormatString="N2" Minimum="0" Maximum="50" MaxLength="4"/>
         <Label Content="{x:Static p:Resources.textTidalWindow}" FontWeight="DemiBold" Grid.Column="0" Grid.Row="7" HorizontalContentAlignment="Right"/>
         <Label Content="{x:Static p:Resources.textFrom}" Grid.Column="0" Grid.Row="8" HorizontalContentAlignment="Right"/>
         <Label Content="{x:Static p:Resources.textTo}" Grid.Column="0" Grid.Row="9" HorizontalContentAlignment="Right"/>
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
index 1cedbe8..1b613aa 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
@@ -57,7 +57,7 @@
         <Label Content="{x:Static p:Resources.textBerthRemarks}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" />
         <TextBox x:Name="textBoxBerthRemarks" Grid.Column="1" Grid.Row="4" Margin="2" Grid.RowSpan="2" VerticalContentAlignment="Top" AcceptsReturn="True" MaxLength="512"/>
         <Label Content="{x:Static p:Resources.textDraft}" Grid.Column="0" Grid.Row="6" HorizontalContentAlignment="Right" />
-        <xctk:DoubleUpDown x:Name="doubleUpDownDraft" Grid.Column="1" Grid.Row="6" Margin="2" FormatString="N2" Minimum="0" Maximum="50"/>
+        <xctk:DoubleUpDown x:Name="doubleUpDownDraft" Grid.Column="1" Grid.Row="6" Margin="2" FormatString="N2" Minimum="0" Maximum="50" MaxLength="4"/>
         <Label Content="{x:Static p:Resources.textTidalWindow}" FontWeight="DemiBold" Grid.Column="0" Grid.Row="7" HorizontalContentAlignment="Right"/>
         <Label Content="{x:Static p:Resources.textFrom}" Grid.Column="0" Grid.Row="8" HorizontalContentAlignment="Right"/>
         <Label Content="{x:Static p:Resources.textTo}" Grid.Column="0" Grid.Row="9" HorizontalContentAlignment="Right"/>
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
index 24c64a8..5116310 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
@@ -66,7 +66,7 @@
         </ComboBox>
         
         <Label Content="{x:Static p:Resources.textDraft}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" />
-        <xctk:DoubleUpDown x:Name="doubleUpDownDraft" Grid.Column="1" Grid.Row="4" Margin="2" FormatString="N2" Minimum="0" Maximum="50"/>
+        <xctk:DoubleUpDown x:Name="doubleUpDownDraft" Grid.Column="1" Grid.Row="4" Margin="2" FormatString="N2" Minimum="0" Maximum="50" MaxLength="4"/>
         <Label Content="{x:Static p:Resources.textTidalWindow}" FontWeight="DemiBold" Grid.Column="0" Grid.Row="5" HorizontalContentAlignment="Right"/>
         <Label Content="{x:Static p:Resources.textFrom}" Grid.Column="0" Grid.Row="6" HorizontalContentAlignment="Right"/>
         <Label Content="{x:Static p:Resources.textTo}" Grid.Column="0" Grid.Row="7" HorizontalContentAlignment="Right"/>
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 3a12737..e5bfe61 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -107,7 +107,7 @@ namespace BreCalClient
         {
             if (string.IsNullOrEmpty(this.textPassword.Password) || string.IsNullOrEmpty(this.textUsername.Text))
             {
-                this.labelLoginResult.Content = Application.Current.FindResource("textUserNamePasswordEmpty").ToString();
+                this.labelLoginResult.Content = BreCalClient.Resources.Resources.textUserNamePasswordEmpty;
                 return;
             }
 
diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs
index 99a3e26..67c41c4 100644
--- a/src/BreCalClient/Resources/Resources.Designer.cs
+++ b/src/BreCalClient/Resources/Resources.Designer.cs
@@ -922,6 +922,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Username and/or password empty!.
+        /// </summary>
+        public static string textUserNamePasswordEmpty {
+            get {
+                return ResourceManager.GetString("textUserNamePasswordEmpty", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Voyage.
         /// </summary>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index b3b04f0..b5c3b4d 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -418,4 +418,7 @@
   <data name="textWrongCredentials" xml:space="preserve">
     <value>Benutzername / Passwort falsch</value>
   </data>
+  <data name="textUserNamePasswordEmpty" xml:space="preserve">
+    <value>Benutzername / Password leer!</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx
index 701f0cf..6ed834b 100644
--- a/src/BreCalClient/Resources/Resources.resx
+++ b/src/BreCalClient/Resources/Resources.resx
@@ -400,6 +400,9 @@
   <data name="textUsername" xml:space="preserve">
     <value>User name</value>
   </data>
+  <data name="textUserNamePasswordEmpty" xml:space="preserve">
+    <value>Username and/or password empty!</value>
+  </data>
   <data name="textVoyage" xml:space="preserve">
     <value>Voyage</value>
   </data>
diff --git a/src/BreCalClient/Resources/StringResources.de.xaml b/src/BreCalClient/Resources/StringResources.de.xaml
index 03ed42a..329646c 100644
--- a/src/BreCalClient/Resources/StringResources.de.xaml
+++ b/src/BreCalClient/Resources/StringResources.de.xaml
@@ -5,6 +5,5 @@
 	<system:String x:Key="textUsername">Benutzername</system:String>
 	<system:String x:Key="textPassword">Passwort</system:String>
 	<system:String x:Key="textLogin">Anmelden</system:String>
-	<system:String x:Key="textExit">Abbrechen</system:String>
-	<system:String x:Key="textUserNamePasswordEmpty">Benutzername / Password leer!</system:String>
+    <system:String x:Key="textExit">Abbrechen</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/BreCalClient/Resources/StringResources.xaml b/src/BreCalClient/Resources/StringResources.xaml
index 91d9b0c..f8ee15e 100644
--- a/src/BreCalClient/Resources/StringResources.xaml
+++ b/src/BreCalClient/Resources/StringResources.xaml
@@ -7,5 +7,4 @@
     <system:String x:Key="textLogin">Login</system:String>
     <system:String x:Key="textExit">Exit</system:String>
     <system:String x:Key="textApplicationTitle">Bremen calling</system:String>
-    <system:String x:Key="textUserNamePasswordEmpty">Username and/or password empty!</system:String>
 </ResourceDictionary>
\ No newline at end of file