diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 21fe1300897..c8b15197270 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -12,12 +12,6 @@
                     <title>OpenERP</title>
                     <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
                     <link rel="stylesheet" href="/web/static/src/css/full.css" />
-                    <t t-foreach="css" t-as="css_file">
-                        <link rel="stylesheet" t-att-href="css_file"/>
-                    </t>
-                    <t t-foreach="js" t-as="js_file">
-                        <script type="text/javascript" t-att-src="js_file"></script>
-                    </t>
                     <t t-raw="head or ''"/>
                 </head>
                 <body t-att-class="body_classname">
@@ -29,6 +23,12 @@
         <template id="web.webclient_bootstrap" name="Webclient Bootstrap">
             <t t-call="web.layout">
                 <t t-set="head">
+                    <t t-foreach="css" t-as="css_file">
+                        <link rel="stylesheet" t-att-href="css_file"/>
+                    </t>
+                    <t t-foreach="js" t-as="js_file">
+                        <script type="text/javascript" t-att-src="js_file"></script>
+                    </t>
                     <script type="text/javascript">
                         $(function() {
                             var s = new openerp.init(<t t-raw="modules"/>);
@@ -45,56 +45,67 @@
             </t>
         </template>
 
-        <template id="web.login" name="Login">
+        <template id="web.login_layout" name="Login Layout">
             <t t-call="web.layout">
+                <t t-set="body_classname" t-value="'oe_single_form'"/>
+                <div class="oe_single_form_container modal-content">
+                    <div class="oe_single_form_logo">
+                        <img src="/web/static/src/img/logo2.png"/>
+                    </div>
+                    <hr/>
+                    <t t-raw="0"/>
+                </div>
+            </t>
+        </template>
+
+        <template id="web.login" name="Login">
+            <t t-call="web.login_layout">
                 <t t-set="head">
+                    <t t-foreach="css" t-as="css_file">
+                        <link rel="stylesheet" t-att-href="css_file"/>
+                    </t>
+                    <t t-foreach="js" t-as="js_file">
+                        <script type="text/javascript" t-att-src="js_file"></script>
+                    </t>
                     <script type="text/javascript">
                         $(function() {
                             var login_form = new openerp.web.LoginForm($('.oe_login_form'));
                         });
                     </script>
                 </t>
-                <t t-set="body_classname" t-value="'oe_single_form'"/>
 
-                <div class="oe_single_form_container modal-content">
+                <form class="oe_login_form" role="form" t-attf-action="/web/login{{ '?debug' if debug else '' }}" method="post">
+                    <div class="form-group field-login">
+                        <label for="login" class="control-label">Login</label>
+                        <input type="text" name="login" t-att-value="login" id="login" class="form-control" placeholder="Enter login" required="required" autofocus="autofocus"/>
+                    </div>
 
-                    <form class="oe_login_form" role="form" t-attf-action="/web/login{{ '?debug' if debug else '' }}" method="post">
-                        <div class="oe_single_form_logo">
-                            <img src="/web/static/src/img/logo2.png"/>
-                        </div>
+                    <div class="form-group field-password">
+                        <label for="password" class="control-label">Password</label>
+                        <input type="password" name="password" id="password" class="form-control" placeholder="Password" required="required"/>
+                    </div>
 
-                        <hr/>
+                    <div class="oe_login_messages">
+                        <p class="alert alert-danger" t-if="authentication_failed">
+                            Wrong login/password
+                        </p>
+                    </div>
 
-                        <div class="form-group field-login">
-                            <label for="login" class="control-label">Login</label>
-                            <input type="text" name="login" t-att-value="login" id="login" class="form-control" placeholder="Enter login" required="required" autofocus="autofocus"/>
-                        </div>
-
-                        <div class="form-group field-password">
-                            <label for="password" class="control-label">Password</label>
-                            <input type="password" name="password" id="password" class="form-control" placeholder="Password" required="required"/>
-                        </div>
-
-                        <div class="oe_login_messages">
-                            <p class="alert alert-danger" t-if="authentication_failed">
-                                Wrong login/password
-                            </p>
-                        </div>
-
-                        <hr/>
-                        <input type="hidden" name="redirect" t-att-value="redirect"/>
+                    <hr/>
+                    <input type="hidden" name="redirect" t-att-value="redirect"/>
+                    <div class="clearfix oe_login_buttons">
                         <button type="submit" class="btn btn-primary pull-right">Log in</button>
+                    </div>
 
-                        <div class="oe_single_form_footer">
-                            <t t-if="not disable_database_manager">
-                                <a class="oe_login_manage_db" t-attf-href="/web/database/manager{{ '?debug' if debug else '' }}">Manage Databases</a>
-                                <span class="oe_footer_seperator"> | </span>
-                            </t>
-                            <a href="http://www.openerp.com" target="_blank">Powered by <span>OpenERP</span></a>
-                        </div>
-                    </form>
-
+                </form>
+                <div class="oe_single_form_footer" t-if="not disable_footer">
+                    <t t-if="not disable_database_manager">
+                        <a class="oe_login_manage_db" t-attf-href="/web/database/manager{{ '?debug' if debug else '' }}">Manage Databases</a>
+                        <span class="oe_footer_seperator"> | </span>
+                    </t>
+                    <a href="http://www.openerp.com" target="_blank">Powered by <span>OpenERP</span></a>
                 </div>
+
             </t>
         </template>