diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 94ddd8f33c8..c3935effdeb 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -720,12 +720,13 @@ instance.web.ChangePassword =  instance.web.Widget.extend({
     template: "ChangePassword",
     start: function() {
         var self = this;
+        this.getParent().dialog_title = "Change Password";
         var $button = self.$el.find('.oe_form_button');
-        var footer_panel = this.getParent().$buttons.find('footer');
-        $button.eq(1).appendTo(footer_panel).click(function(){
+        $button.appendTo(this.getParent().$buttons);
+        $button.eq(2).click(function(){
            self.getParent().close();
         })
-        $button.eq(0).prependTo(footer_panel).click(function(){
+        $button.eq(0).click(function(){
           self.rpc("/web/session/change_password",{
                'fields': $("form[name=change_password_form]").serializeArray()
           }).done(function(result) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f48650d0115..33997b7a920 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -335,6 +335,7 @@
             <tr>
                 <td colspan="2" align="right">
                     <button class='oe_button oe_form_button'>Change Password</button>
+                    <span class="oe_fade oe_form_button"> or </span>
                     <button type="button" class="oe_button oe_form_button_cancel oe_form_button oe_link" href="javascript:void(0)"><span>Cancel</span></button>
                 </td>
             </tr>