diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index f5a24c15248..67f665abc30 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -490,7 +490,6 @@ openerp.web.Login =  openerp.web.Widget.extend(/** @lends openerp.web.Login# */{
     },
     start: function() {
         var self = this;
-
         this.database = new openerp.web.Database(
                 this, "oe_database", "oe_db_options");
 
@@ -501,8 +500,15 @@ openerp.web.Login =  openerp.web.Widget.extend(/** @lends openerp.web.Login# */{
         this.$element.find("form").submit(this.on_submit);
 
         this.rpc("/web/database/get_list", {}, function(result) {
-            self.db_list = result.db_list;
+            var tpl = openerp.web.qweb.render('Login_dblist', {db_list: result.db_list, selected_db: self.selected_db});
+            self.$element.find("input[name=db]").replaceWith(tpl)
+        }, 
+        function(error, event) {
+            if (error.data.fault_code === 'AccessDenied') {
+                event.preventDefault();
+            }
         });
+
     },
     on_login_invalid: function() {
         this.$element.closest(".openerp").addClass("login-mode");
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 25d256992d7..e3b88dfdcd5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -242,6 +242,21 @@
         </table>
     </form>
 </t>
+
+<t t-name="Login_dblist">
+    <select name="db">
+        <t t-foreach="db_list" t-as="db">
+            <t t-if="selected_db === db">
+                <option t-att-value="db" selected="true">
+                    <t t-esc="db"/></option>
+            </t>
+            <t t-if="selected_db !== db">
+                <option t-att-value="db"><t t-esc="db"/></option>
+            </t>
+        </t>
+    </select>
+</t>
+
 <t t-name="Login">
     <form class="oe_forms">
         <fieldset>
@@ -253,22 +268,7 @@
                     <tr>
                         <td><label for="db">Database:</label></td>
                         <td>
-                            <t t-if="!db_list">
-                                <input type="text" name="db" t-att-value="selected_db || ''" autofocus="true"/>
-                            </t>
-                            <t t-if="db_list">
-                                <select name="db">
-                                    <t t-foreach="db_list" t-as="db">
-                                        <t t-if="selected_db === db">
-                                            <option t-att-value="db" selected="true">
-                                                <t t-esc="db"/></option>
-                                        </t>
-                                        <t t-if="selected_db !== db">
-                                            <option t-att-value="db"><t t-esc="db"/></option>
-                                        </t>
-                                    </t>
-                                </select>
-                            </t>
+                            <input type="text" name="db" t-att-value="selected_db || ''" autofocus="true"/>
                         </td>
                     </tr>
                     <tr>