diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index 2330ffc53..15e0ede6a 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -683,6 +683,7 @@ namespace BeWo
 			var settingsKeyValuePairList = _Mandator.Settings.SplitToKeyValuePairList(";", "=").ToList();
 
 			var x = settingsKeyValuePairList.FirstOrDefault(f => f.Key.Equals("TimeUntilUILock")).Value ?? "NULL";
+            
 			var y = _LockUITime;
 
 			AutoLockUI.LockUITime = Convert.ToInt32(settingsKeyValuePairList.FirstOrDefault(f => f.Key.Equals("TimeUntilUILock")).Value ?? LockUITime.ToString());
diff --git a/BeWo/LockedPage.xaml b/BeWo/LockedPage.xaml
index 7dddef8b9..669da82f4 100644
--- a/BeWo/LockedPage.xaml
+++ b/BeWo/LockedPage.xaml
@@ -52,8 +52,8 @@
                         <Label Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Benutzername:" Foreground="#FF000000" Background="#00000000" />
                         <Label Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left" Content="Passwort:" Foreground="#FF000000" Background="#00000000" />
                         <TextBox TabIndex="0" SnapsToDevicePixels="True" Grid.Column="2" Grid.Row="1" Margin="10,10,20,10" Height="24" x:Name="TextBoxUsername" HorizontalAlignment="Stretch" Text="" />
-                        <PasswordBox Margin="10,0,20,0" Height="24" Grid.Column="2" Grid.Row="2" x:Name="PasswordBoxPassword" Password="" HorizontalAlignment="Stretch" />
-                        <Button Margin="10,30,20,50" Height="30" x:Name="ButtonLogin" Grid.Column="2" Grid.Row="3" HorizontalAlignment="Stretch" Content="Anmelden" IsDefault="True" Foreground="White" />
+                        <PasswordBox Margin="10,0,20,0" Height="24" Grid.Column="2" Grid.Row="2" x:Name="PasswordBoxPassword" Password="" HorizontalAlignment="Stretch" TabIndex="1" />
+                        <Button Margin="10,30,20,50" Height="30" x:Name="ButtonLogin" Grid.Column="2" Grid.Row="3" HorizontalAlignment="Stretch" Content="Anmelden" IsDefault="True" Foreground="White" TabIndex="2" />
                         <Label VerticalAlignment="Bottom" HorizontalAlignment="Left" Content="Copyright 2010 | beyondSoft GmbH" Foreground="#FF818181" Margin="5,0,0,3" Grid.Row="3" Grid.ColumnSpan="3" Grid.Column="0" FontSize="10" />
                         <TextBlock Grid.Row="3" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="10" Margin="0,0,12,10">
 							<Hyperlink TargetName="newWindow" Foreground="#FF818181" NavigateUri="http://www.beyondsoft.de">www.beyondsoft.de</Hyperlink>
diff --git a/Host/Multitenancy/demo.config b/Host/Multitenancy/demo.config
index b3c03c5ef..36201eb31 100644
--- a/Host/Multitenancy/demo.config
+++ b/Host/Multitenancy/demo.config
@@ -20,7 +20,7 @@
           </property>-->
 
           <property name="connection.connection_string">
-            Server=localhost;Password=root;User ID=root; Initial Catalog=bewodemo
+            Server=localhost;Password=root;User ID=root; Initial Catalog=1111111111
           </property>
 
           <property name="dialect">