diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 78cad811122..ad0bec6c255 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -62,17 +62,19 @@ body.openerp {
 .openerp .login {
     display: none;
 }
+.openerp .login form {
+    float: left;
+    width: 420px;
+    margin-left: 40px;
+    margin-bottom: 60px;
+}
 .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;
@@ -84,12 +86,34 @@ body.openerp {
     width: 100%;
     border:none;
 }
-.openerp .login .oe_field_value {
+.openerp .login .oe_box2 td {
     padding: 3px;
+    text-align: right;
 }
-.openerp .login_valid {
+.openerp .login .oe_box2 td input {
+    width: 100%;
 }
-.openerp .login_invalid {
+.openerp .login .oe_login_right_pane {
+    padding:70px 35px 5px 10px;
+    min-width: 200px;
+    margin-left: 500px;
+}
+.openerp .login .login_error_message {
+    display: none;
+    background-color: #9A0404;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    color: white;
+    font-family: Ubuntu, Helvetica, sans-serif;
+    font-size: 16px;
+    font-weight: bold;
+    padding: 5px;
+    margin-top: 5px;
+    text-align: center;
+}
+.openerp .login.login_invalid .login_error_message {
+    display: block;
 }
 
 .openerp.login-mode .login-container {
diff --git a/addons/base/static/src/img/accessories-archiver.png b/addons/base/static/src/img/accessories-archiver.png
new file mode 100644
index 00000000000..8bcbe4566bc
Binary files /dev/null and b/addons/base/static/src/img/accessories-archiver.png differ
diff --git a/addons/base/static/src/img/partner.png b/addons/base/static/src/img/partner.png
new file mode 100644
index 00000000000..aab206a1d42
Binary files /dev/null and b/addons/base/static/src/img/partner.png differ
diff --git a/addons/base/static/src/img/product.png b/addons/base/static/src/img/product.png
new file mode 100644
index 00000000000..99f58d95a8b
Binary files /dev/null and b/addons/base/static/src/img/product.png differ
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 7a5f627ee72..ca0a0ff7205 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -51,7 +51,6 @@
     Loading...
 </t>
 <t t-name="Login">
-    
     <form>
         <fieldset>
             <legend style="">
@@ -75,16 +74,52 @@
                     </tr>
                     <tr>
                         <td></td>
-                        <td class="db_login_buttons">
-                            <input type="submit" name="submit" value="Login"/>
+                        <td class="oe_field_value">
+                            <button type="submit" name="submit">Login</button>
                         </td>
                     </tr>
                 </table>
             </div>
         </fieldset>
+        <div class="login_error_message">Bad username or password</div>
     </form>
-             
-    
+    <div class="oe_login_right_pane">
+        <p>We think that daily job activities can be more intuitive, efficient, automated, .. and even fun.</p>
+        <h3>OpenERP's vision to be:</h3>
+        
+        <table cellpadding="0" cellspacing="0" width="100%" style="border:none;">
+            <tbody>
+            <tr>
+                <td>
+                    <img src="/base/static/src/img/product.png"/>
+                </td>
+                <td>
+                    <strong>Full featured</strong><br />
+                    Today's enterprise challenges are multiple. We provide one module for each need.
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <img src="/base/static/src/img/accessories-archiver.png"/>
+                </td>
+                <td>
+                    <strong>Open Source</strong><br />
+                    To Build a great product, we rely on the knowledge of thousands of contributors.
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <img src="/base/static/src/img/partner.png" />
+                </td>
+                <td>
+                    <strong>User Friendly</strong><br />
+                    In order to be productive, people need clean and easy to use interface.
+                </td>
+            </tr>
+            </tbody>
+        </table>
+        
+    </div>
 </t>
 <t t-name="Header">
     <a href="/" class="company_logo_link">