diff --git a/data/gui/user_screen.stkgui b/data/gui/user_screen.stkgui
index 63496bfe3..e636e3f73 100644
--- a/data/gui/user_screen.stkgui
+++ b/data/gui/user_screen.stkgui
@@ -15,13 +15,15 @@
             <spacer height="15" width="10"/>
             <div width="90%" align="center" layout="vertical-row" height="fit">
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <label width="40%" height="100%" text_align="left" I18N="In the login screen" text="Online"/>
                     <checkbox width="fit" id="online" I18N="In the login screen" text_align="left"/>
+                    <spacer width="10"/>
+                    <label proportion="1" height="100%" text_align="left" I18N="In the login screen" text="Online"/>
                 </div>
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <label  width="40%"  id="label_remember" height="100%" text_align="left"
-                              I18N="In the login screen" text="Remember password"/>
                     <checkbox width="fit" id="remember-user" I18N="In the login screen" text_align="left"/>
+                    <spacer width="10"/>
+                    <label proportion="1" id="label_remember" height="100%" text_align="left"
+                              I18N="In the login screen" text="Remember password"/>
                 </div>
                 <!-- Disable guest accounts for now
                 <div width="100%" height="fit" layout="horizontal-row" >
diff --git a/data/gui/user_screen_tab.stkgui b/data/gui/user_screen_tab.stkgui
index b16feb49a..05f0071a2 100644
--- a/data/gui/user_screen_tab.stkgui
+++ b/data/gui/user_screen_tab.stkgui
@@ -24,13 +24,15 @@
             <spacer height="15" width="10"/>
             <div width="90%" align="center" layout="vertical-row" height="fit">
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <label width="40%" height="100%" text_align="left" I18N="In the login screen" text="Online"/>
                     <checkbox width="fit" id="online" I18N="In the login screen" text_align="left"/>
+                    <spacer width="10"/>
+                    <label proportion="1" height="100%" text_align="left" I18N="In the login screen" text="Online"/>
                 </div>
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <label    id="label_remember" width="40%" height="100%" text_align="left"
-                              I18N="In the login screen" text="Remember password"/>
                     <checkbox width="fit" id="remember-user" I18N="In the login screen" text_align="left"/>
+                    <spacer width="10"/>
+                    <label id="label_remember" proportion="1" height="100%" text_align="left"
+                              I18N="In the login screen" text="Remember password"/>
                 </div>
                 <!-- Disable guest accounts for now
                 <div width="100%" height="fit" layout="horizontal-row" >
diff --git a/src/guiengine/event_handler.cpp b/src/guiengine/event_handler.cpp
index 59b174607..a29fe8cb2 100644
--- a/src/guiengine/event_handler.cpp
+++ b/src/guiengine/event_handler.cpp
@@ -184,6 +184,15 @@ bool EventHandler::OnEvent (const SEvent &event)
         // FIXME? it may be a bit unclean that all input events go trough
         // the gui module
         const EventPropagation blockPropagation = input_manager->input(event);
+
+        if (event.EventType == EET_KEY_INPUT_EVENT &&
+            event.KeyInput.Key == irr::KEY_TAB)
+        {
+            // block all tab events, if we let them go, irrlicht will try
+            // to apply its own focus code
+            return true; // EVENT_BLOCK
+        }
+
         return blockPropagation == EVENT_BLOCK;
     }
     else if (event.EventType == EET_LOG_TEXT_EVENT)