diff --git a/web-jspack/org.openbravo.core2/src/components/AuthProvider/ExpiredPasswordDialog/ExpiredPasswordDialog.jsx b/web-jspack/org.openbravo.core2/src/components/AuthProvider/ExpiredPasswordDialog/ExpiredPasswordDialog.jsx
index 1494536e..c9f3f66b 100644
--- a/web-jspack/org.openbravo.core2/src/components/AuthProvider/ExpiredPasswordDialog/ExpiredPasswordDialog.jsx
+++ b/web-jspack/org.openbravo.core2/src/components/AuthProvider/ExpiredPasswordDialog/ExpiredPasswordDialog.jsx
@@ -12,7 +12,6 @@ import React, { useRef, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { getLabel } from '../../../core/I18N';
 import InputPassword from '../../InputPassword';
-import StandardButton from '../../StandardButton';
 import BaseDialog from '../../BaseDialog';
 import Translate from '../../Translate';
 import LoginProcess from '../../../core/authentication/LoginProcess';
@@ -189,28 +188,35 @@ const ExpiredPasswordDialog = ({ loginProcess }) => {
   } = state;
 
   const dialogActions = () => {
-    return (
-      <div className="obc2ExpiredPasswordDialog-actions obc2StandardDialog-buttons">
-        <StandardButton
-          variantClass="obc2ExpiredPasswordDialog-actions-cancel"
-          testId="obc2ExpiredPasswordDialog-actions-cancel"
-          label={getLabel('$OBC2_ExpiredPasswordCancel')}
-          events={() => ({
+    return [
+      {
+        id: 'obc2ExpiredPasswordDialog-actions-cancel',
+        component: 'OBC2_StandardButton',
+        properties: {
+          variantClass: 'obc2ExpiredPasswordDialog-actions-cancel',
+          testId: 'obc2ExpiredPasswordDialog-actions-cancel',
+          label: getLabel('$OBC2_ExpiredPasswordCancel'),
+          events: () => ({
             onLeftClick: () => closeDialog()
-          })}
-          disabled={isAuthenticating}
-        />
-        <StandardButton
-          variantClass="obc2ExpiredPasswordDialog-actions-confirm obc2StandardButton_primary"
-          testId="obc2ExpiredPasswordDialog-actions-confirm"
-          label={getLabel('$OBC2_ExpiredPasswordConfirm')}
-          events={() => ({
+          }),
+          disabled: isAuthenticating
+        }
+      },
+      {
+        id: 'obc2ExpiredPasswordDialog-actions-confirm',
+        component: 'OBC2_StandardButton',
+        properties: {
+          variantClass:
+            'obc2ExpiredPasswordDialog-actions-confirm obc2StandardButton_primary',
+          testId: 'obc2ExpiredPasswordDialog-actions-confirm',
+          label: getLabel('$OBC2_ExpiredPasswordConfirm'),
+          events: () => ({
             onLeftClick: () => changeExpiredPasswordHandler()
-          })}
-          disabled={isAuthenticating}
-        />
-      </div>
-    );
+          }),
+          disabled: isAuthenticating
+        }
+      }
+    ];
   };
 
   return (
@@ -218,6 +224,7 @@ const ExpiredPasswordDialog = ({ loginProcess }) => {
       open={expiredPasswordState && expiredPasswordState.open}
       title="$OBC2_ResetPasswordDialogTitle"
       actions={dialogActions()}
+      actionsVariantClass="obc2ExpiredPasswordDialog-actions obc2StandardDialog-buttons"
       onClose={() => closeDialog()}
       variantClass="obc2ExpiredPasswordDialog"
       testId="obc2ExpiredPasswordDialog"
diff --git a/web-jspack/org.openbravo.core2/src/components/BaseDialog/BaseDialog.jsx b/web-jspack/org.openbravo.core2/src/components/BaseDialog/BaseDialog.jsx
index e7e8272b..a226c3e3 100644
--- a/web-jspack/org.openbravo.core2/src/components/BaseDialog/BaseDialog.jsx
+++ b/web-jspack/org.openbravo.core2/src/components/BaseDialog/BaseDialog.jsx
@@ -50,6 +50,7 @@ import './BaseDialog.scss';
 const BaseDialog = ({
   children,
   actions,
+  actionsVariantClass,
   title,
   titleParams,
   subTitle,
@@ -120,7 +121,7 @@ const BaseDialog = ({
             verticalOrigin: 'bottom',
             horizontalOrigin: 'center'
           }}
-          variantClass="obc2BaseDialog-buttonArea"
+          variantClass={`obc2BaseDialog-buttonArea ${actionsVariantClass}`}
           testId={`${testId}-buttons`}
         />
       </div>
@@ -212,6 +213,7 @@ const BaseDialog = ({
 BaseDialog.propTypes = {
   children: PropTypes.node,
   actions: PropTypes.node,
+  actionsVariantClass: PropTypes.string,
   title: PropTypes.string,
   titleParams: PropTypes.arrayOf(PropTypes.string),
   subTitle: PropTypes.string,
@@ -234,6 +236,7 @@ BaseDialog.propTypes = {
 BaseDialog.defaultProps = {
   children: null,
   actions: null,
+  actionsVariantClass: '',
   title: '',
   titleParams: [],
   subTitle: '',