diff --git a/odoo/addons/base/static/src/scss/res_partner.scss b/odoo/addons/base/static/src/scss/res_partner.scss
index 7115b9edcc3..0a56f77a61a 100644
--- a/odoo/addons/base/static/src/scss/res_partner.scss
+++ b/odoo/addons/base/static/src/scss/res_partner.scss
@@ -14,3 +14,9 @@
         --gutter-x: 0;
     }
 }
+
+// This is an ugly workaround to prevent having ugly borders in the Password confirmation dialog
+// TODO: remove me in master
+.modal .o_form_view .o_form_sheet_bg.bg-primary {
+    --background-color: #{$o-view-background-color};
+}
diff --git a/odoo/addons/base/views/res_users_identitycheck_views.xml b/odoo/addons/base/views/res_users_identitycheck_views.xml
index 966b5a70c0e..b750e056ec0 100644
--- a/odoo/addons/base/views/res_users_identitycheck_views.xml
+++ b/odoo/addons/base/views/res_users_identitycheck_views.xml
@@ -6,7 +6,7 @@
             <field name="model">res.users.identitycheck</field>
             <field name="arch" type="xml">
                 <form string="Password Confirmation">
-                    <sheet class="bg-primary">
+                    <sheet>
                         <h3><strong>Please enter your password to confirm you own this account</strong></h3>
                         <div>
                             <field class="o_field_highlight col-10 col-md-6 px-0" name="password" autocomplete="current-password"