diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 05f9fb5b1b6..e7c1a08788e 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -109,7 +109,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         } else if (val.slice(-1) == "%") {
             return Math.round(available_size / 100 * parseInt(val.slice(0, -1), 10));
         } else {
-            return parseInt(val, 10);        
+            return parseInt(val, 10);
         }
     },
     renderElement: function() {
@@ -123,7 +123,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         if (! this.dialog_inited)
             this.init_dialog();
         var o = this.get_options(options);
-        instance.web.dialog(this.$element, o).dialog('open');     
+        instance.web.dialog(this.$element, o).dialog('open');
         if (o.height === 'auto' && o.max_height) {
             this.$element.css({ 'max-height': o.max_height, 'overflow-y': 'auto' });
         }
@@ -627,7 +627,7 @@ instance.web.Reload = instance.web.Widget.extend({
         var search = "?ts=" + timestamp;
         if (l.search) {
             search = l.search + "&ts=" + timestamp;
-        } 
+        }
         var hash = l.hash;
         if (this.menu_id) {
             hash = "#menu_id=" + this.menu_id;
@@ -665,7 +665,7 @@ instance.web.ChangePassword =  instance.web.Widget.extend({
     template: "ChangePassword",
     start: function() {
         var self = this;
-        self.$element.find("form[name=change_password_form]").validate({
+        self.$element.validate({
             submitHandler: function (form) {
                 self.rpc("/web/session/change_password",{
                     'fields': $(form).serializeArray()
@@ -685,7 +685,7 @@ instance.web.ChangePassword =  instance.web.Widget.extend({
             modal: true,
             title: error.title,
             buttons: [
-                {text: _("Ok"), click: function() { $(this).dialog("close"); }}
+                {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
             ]
         }).html(error.error);
     },
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c3ba8f79c8e..33d6e03780d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -282,7 +282,7 @@
             <tr>
             <td><label for="new_password">New Password:</label></td>
             <td><input type="password" name="new_password"
-                       minlength="1" autofocus="autofocus"/></td>
+                       minlength="1"/></td>
             </tr>
             <tr>
                 <td><label for="confirm_pwd">Confirm Password:</label></td>
@@ -1049,7 +1049,7 @@
                     <span></span>
                 </span>
                 <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i &lt; size - 1"/>
-            </div>            
+            </div>
         </li>
     </t>
 </t>