diff --git a/data/gui/user_screen.stkgui b/data/gui/user_screen.stkgui
index db506d25b..711a87c04 100644
--- a/data/gui/user_screen.stkgui
+++ b/data/gui/user_screen.stkgui
@@ -13,7 +13,7 @@
                                square_items="true" child_width="128" child_height="128" />
 
             <spacer height="15" width="10"/>
-            <div width="90%" align="center" layout="vertical-row" height="fit">
+            <div width="90%" align="center" layout="vertical-row" proportion="1">
                 <div width="100%" height="fit" layout="horizontal-row" >
                     <checkbox width="fit" id="online" I18N="In the user screen" text_align="left"/>
                     <spacer width="10"/>
@@ -44,15 +44,16 @@
                            I18N="In the user screen" text="Password"/>
                     <textbox id="password" proportion="2" height="fit" I18N="In the user screen"/>
                 </div>
-            </div>
-            <div width="80%" align="center" layout="vertical-row" height="fit">
-                <label id="message" width="80%" align="center" text_align="left"/>
+                
+                <spacer height="20" width="20"/>
+                
+                <label id="message" width="100%" text_align="center"/>
             </div>
             
 			<spacer width="20" proportion="1"/>
 			
 			<div width="90%" align="center" layout="vertical-row" height="fit">
-				<buttonbar id="options" width="100%" height="100%" align="center">
+				<buttonbar id="options" width="100%" height="80" align="center">
 					<icon-button id="ok" width="64" height="64" icon="gui/green_check.png"
 								 I18N="In the user screen" text="OK" label_location="bottom"/>
 					<icon-button id="new_user" width="64" height="64" icon="gui/blue_plus.png"