diff --git a/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialog.tsx b/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialog.tsx
index 3cefd0ae..12680766 100644
--- a/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialog.tsx
+++ b/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialog.tsx
@@ -31,7 +31,6 @@ export const ChangePasswordDialog: React.FC<ChangePasswordDialogProps> = (props)
         onPrevious,
         onFinish,
         PasswordProps,
-        ErrorDialogProps,
         loading,
         currentPasswordTextFieldProps,
         slots = {},
@@ -41,7 +40,6 @@ export const ChangePasswordDialog: React.FC<ChangePasswordDialogProps> = (props)
     const [currentInput, setCurrentInput] = useState('');
     const [passwordInput, setPasswordInput] = useState('');
     const [confirmInput, setConfirmInput] = useState('');
-    const [showErrorDialog, setShowErrorDialog] = useState(false);
     const [isLoading, setIsLoading] = useState(loading);
     const [showSuccessScreen, setShowSuccessScreen] = useState(false);
     const { actions, navigate, routeConfig } = useAuthContext();
@@ -91,7 +89,6 @@ export const ChangePasswordDialog: React.FC<ChangePasswordDialogProps> = (props)
                 setShowSuccessScreen(true);
             } catch (_error) {
                 setHasVerifyCodeError(true);
-                setShowErrorDialog(true);
                 triggerError(_error as Error);
             } finally {
                 setIsLoading(false);
@@ -106,7 +103,6 @@ export const ChangePasswordDialog: React.FC<ChangePasswordDialogProps> = (props)
         onFinish,
         props.showSuccessScreen,
         triggerError,
-        setShowErrorDialog,
     ]);
 
     const passwordProps = {
@@ -129,15 +125,6 @@ export const ChangePasswordDialog: React.FC<ChangePasswordDialogProps> = (props)
         },
     };
 
-    const errorDialogProps = {
-        open: showErrorDialog,
-        title: t('bluiCommon:MESSAGES.ERROR'),
-        body: t('bluiAuth:CHANGE_PASSWORD.PROBLEM_OCCURRED'),
-        dismissButtonText: t('bluiCommon:ACTIONS.OKAY'),
-        ...ErrorDialogProps,
-        onClose: (): void => setShowErrorDialog(false),
-    };
-
     return (
         <ChangePasswordDialogBase
             open={open}
@@ -154,7 +141,6 @@ export const ChangePasswordDialog: React.FC<ChangePasswordDialogProps> = (props)
             enableButton={checkPasswords}
             onPrevious={onPrevious}
             PasswordProps={passwordProps}
-            ErrorDialogProps={errorDialogProps}
             currentPasswordTextFieldProps={currentPasswordTextFieldProps}
             onSubmit={async (): Promise<void> => {
                 await changePasswordSubmit();
diff --git a/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialogBase.tsx b/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialogBase.tsx
index d2a97b4d..fa1e0d6a 100644
--- a/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialogBase.tsx
+++ b/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialogBase.tsx
@@ -14,7 +14,6 @@ import {
 import { ChangePasswordDialogProps } from './types';
 import { SetPassword } from '../SetPassword';
 import { PasswordTextField } from '../PasswordTextField';
-import { BasicDialog } from '../Dialog';
 import { Spinner } from '../../components';
 import { SuccessScreenBase, SuccessScreenProps } from '../../screens';
 import { unstable_composeClasses as composeClasses } from '@mui/base';
@@ -35,7 +34,6 @@ const useUtilityClasses = (ownerState: ChangePasswordDialogProps): Record<Change
     const slots = {
         root: ['root'],
         spinner: ['spinner'],
-        basicDialog: ['basicDialog'],
         title: ['title'],
         content: ['content'],
         description: ['description'],
@@ -60,7 +58,6 @@ export const ChangePasswordDialogBase: React.FC<ChangePasswordDialogProps> = (pr
         currentPasswordChange,
         onSubmit,
         onPrevious,
-        ErrorDialogProps,
         PasswordProps,
         loading,
         currentPasswordTextFieldProps,
@@ -117,7 +114,6 @@ export const ChangePasswordDialogBase: React.FC<ChangePasswordDialogProps> = (pr
                 getSuccessScreen(slotProps?.SuccessScreen || {}, slots?.SuccessScreen)
             ) : (
                 <>
-                    <BasicDialog {...ErrorDialogProps} className={defaultClasses.basicDialog} />
                     <DialogTitle
                         sx={{
                             pt: { md: 4, sm: 2 },
diff --git a/login-workflow/src/components/ChangePasswordDialog/types.ts b/login-workflow/src/components/ChangePasswordDialog/types.ts
index 9a001bb1..fbe34b94 100644
--- a/login-workflow/src/components/ChangePasswordDialog/types.ts
+++ b/login-workflow/src/components/ChangePasswordDialog/types.ts
@@ -1,6 +1,5 @@
 import { DialogProps, TextFieldProps } from '@mui/material';
 import { SuccessScreenProps } from '../../screens';
-import { BasicDialogProps } from '../Dialog';
 import { SetPasswordProps } from '../SetPassword';
 import { ErrorManagerProps } from '../Error/types';
 
@@ -25,8 +24,6 @@ export type ChangePasswordDialogSlotsProps = {
 };
 
 export type ChangePasswordDialogProps = DialogProps & { PasswordProps?: SetPasswordProps } & {
-    ErrorDialogProps?: BasicDialogProps;
-} & {
     /**
      * The title to display in the dialog
      */
diff --git a/login-workflow/src/components/ChangePasswordDialog/utilityClasses.ts b/login-workflow/src/components/ChangePasswordDialog/utilityClasses.ts
index 53ddf97a..bd7f0755 100644
--- a/login-workflow/src/components/ChangePasswordDialog/utilityClasses.ts
+++ b/login-workflow/src/components/ChangePasswordDialog/utilityClasses.ts
@@ -3,7 +3,6 @@ import generateUtilityClass from '@mui/material/generateUtilityClass';
 export type ChangePasswordDialogClasses = {
     root?: string;
     spinner?: string;
-    basicDialog?: string;
     title?: string;
     content?: string;
     description?: string;