diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index c5d0a93fe86..5d0dc0946c1 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -912,18 +912,15 @@ openerp.base.Database = openerp.base.Controller.extend({
 });
 
 openerp.base.Login =  openerp.base.Controller.extend({
+    remember_creditentials: true,
     init: function(session, element_id) {
         this._super(session, element_id);
         this.has_local_storage = typeof(localStorage) != 'undefined';
         this.selected_db = null;
         this.selected_login = null;
-        this.selected_password = null;
-        this.remember = false;
-        if (this.has_local_storage && localStorage.getItem('remember_creditentials') === 'true') {
-            this.remember = true;
+        if (this.has_local_storage && this.remember_creditentials) {
             this.selected_db = localStorage.getItem('last_db_login_success');
             this.selected_login = localStorage.getItem('last_login_login_success');
-            this.selected_password = localStorage.getItem('last_password_login_success');
         }
     },
     start: function() {
@@ -952,22 +949,17 @@ openerp.base.Login =  openerp.base.Controller.extend({
         var db = $e.find("form [name=db]").val();
         var login = $e.find("form input[name=login]").val();
         var password = $e.find("form input[name=password]").val();
-        var remember = $e.find("form input[name=remember]").attr('checked');
         //$e.hide();
         // Should hide then call callback
         this.session.session_login(db, login, password, function() {
             if(self.session.session_is_valid()) {
                 if (self.has_local_storage) {
-                    if(remember) {
-                        localStorage.setItem('remember_creditentials', 'true');
+                    if(self.remember_creditentials) {
                         localStorage.setItem('last_db_login_success', db);
                         localStorage.setItem('last_login_login_success', login);
-                        localStorage.setItem('last_password_login_success', password);
                     } else {
-                        localStorage.setItem('remember_creditentials', '');
                         localStorage.setItem('last_db_login_success', '');
                         localStorage.setItem('last_login_login_success', '');
-                        localStorage.setItem('last_password_login_success', '');
                     }
                 }
                 self.on_login_valid();
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index e6428ce284e..914233552b2 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -86,19 +86,7 @@
                     </tr>
                     <tr>
                         <td><label for="password">Password:</label></td>
-                        <td><input type="password" name="password"
-                            t-att-value="selected_password || ''"/></td>
-                    </tr>
-                    <tr t-if="has_local_storage">
-                        <td><label for="remember">Remember password:</label></td>
-                        <td class="oe_remember">
-                            <t t-if="remember">
-                            <input type="checkbox" name="remember" checked="yes"/>
-                            </t>
-                            <t t-if="!remember">
-                            <input type="checkbox" name="remember"/>
-                            </t>
-                        </td>
+                        <td><input type="password" name="password"/></td>
                     </tr>
                     <tr>
                         <td></td>