diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index f65a9be5253..78cad811122 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -61,13 +61,40 @@ body.openerp {
 /* Login */
 .openerp .login {
     display: none;
-
+}
+.openerp .login fieldset {
+    padding-bottom: 5px;
+    min-width: 100px;
+    margin-top: 60px;
+    margin-bottom: 60px;
+    margin-left: 40px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    float: left;
+    width: 420px;
+}
+.openerp .login fieldset legend {
+    padding: 4px;
+}
+.openerp .login .oe_box2 {
+    padding: 5px 5px 20px 5px;
+}
+.openerp .login .oe_box2 table {
+    width: 100%;
+    border:none;
+}
+.openerp .login .oe_field_value {
+    padding: 3px;
 }
 .openerp .login_valid {
 }
 .openerp .login_invalid {
 }
 
+.openerp.login-mode .login-container {
+    height: 100%;
+}
 .openerp.login-mode .login {
     display: block;
 }
diff --git a/addons/base/static/src/img/stock_person.png b/addons/base/static/src/img/stock_person.png
new file mode 100644
index 00000000000..202cf0ee6c5
Binary files /dev/null and b/addons/base/static/src/img/stock_person.png differ
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index cefa4c89c84..2acb66c7ada 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -444,8 +444,8 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
     logout: function() {
         this.uid = this.get_cookie('uid');
         this.session_id = this.get_cookie('session_id');
-        this.set_cookie('uid', false);
-        this.set_cookie('session_id', false);
+        this.set_cookie('uid', '');
+        this.set_cookie('session_id', '');
         this.on_session_invalid(function() {});
     },
     /**
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 3a8e5128f6f..7a5f627ee72 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -34,7 +34,7 @@
         </td>
     </tr>
     <tr>
-        <td colspan="2">
+        <td valign="top" class="login-container" colspan="2">
             <div id="oe_login" class="login"></div>
         </td>
     </tr>
@@ -51,12 +51,40 @@
     Loading...
 </t>
 <t t-name="Login">
+    
     <form>
-        Database: <input type="text" name="db" value="trunk"/><br/>
-        Login: <input type="text" name="login" value="admin"/><br/>
-        Password: <input type="password" name="password" value="a"/><br/>
-        <input type="submit" name="submit" value="Login"/>
+        <fieldset>
+            <legend style="">
+                <img src="/base/static/src/img/stock_person.png" alt="" />
+            </legend>
+            <div class="oe_box2">
+                <table align="center" cellspacing="2px" cellpadding="0">
+                    <tr>
+                        <td><label for="db">Database:</label></td>
+                        <td class="oe_field_value">
+                            <input type="text" name="db" value="trunk" autofocus="true"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label for="login">User:</label></td>
+                        <td class="oe_field_value"><input type="text" name="login" value="admin" autofocus="true"/></td>
+                    </tr>
+                    <tr>
+                        <td><label for="password">Password:</label></td>
+                        <td class="oe_field_value"><input type="password" name="password" value="a"/></td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td class="db_login_buttons">
+                            <input type="submit" name="submit" value="Login"/>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </fieldset>
     </form>
+             
+    
 </t>
 <t t-name="Header">
     <a href="/" class="company_logo_link">