diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 6fa95266ba9..cdc8ff3bf40 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -776,6 +776,8 @@ openerp.base.Database = openerp.base.Controller.extend({
 openerp.base.Login =  openerp.base.Controller.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
+        this.selected_db = this.session.get_cookie('last_db_login_success') || null;
+        this.selected_login = this.session.get_cookie('last_login_login_success') || null;
     },
     start: function() {
         var self = this;
@@ -786,10 +788,10 @@ openerp.base.Login =  openerp.base.Controller.extend({
             self.display();
         });
     },
-   display: function() {
+    display: function() {
         this.$element.html(QWeb.render("Login", this));
         this.$element.find("form").submit(this.on_submit);
-   },
+    },
     on_login_invalid: function() {
         this.$element.closest(".openerp").addClass("login-mode");
     },
@@ -807,6 +809,8 @@ openerp.base.Login =  openerp.base.Controller.extend({
         // Should hide then call callback
         this.session.session_login(db, login, password, function() {
             if(self.session.session_is_valid()) {
+                self.session.set_cookie('last_db_login_success', db);
+                self.session.set_cookie('last_login_login_success', login);
                 self.on_login_valid();
             } else {
                 self.$element.addClass("login_invalid");
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index afbd4f81d91..a723366ae12 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -67,7 +67,12 @@
                             <t t-if="db_list">
                                 <select name="db">
                                     <t t-foreach="db_list" t-as="db">
-                                        <option t-att-value="db" t-att-selected="db == 'trunk'"><t t-esc="db"/></option>
+                                        <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>
@@ -75,7 +80,8 @@
                     </tr>
                     <tr>
                         <td><label for="login">User:</label></td>
-                        <td class="oe_field_value"><input type="text" name="login" value="admin" autofocus="true"/></td>
+                        <td class="oe_field_value"><input type="text" name="login"
+                            t-att-value="selected_login || ''" autofocus="true"/></td>
                     </tr>
                     <tr>
                         <td><label for="password">Password:</label></td>