diff --git a/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialog.tsx b/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialog.tsx
index c1e4926e..51aca671 100644
--- a/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialog.tsx
+++ b/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialog.tsx
@@ -48,6 +48,8 @@ export const ChangePasswordDialog: React.FC<ChangePasswordDialogProps> = (props)
         ErrorDialogProps,
         loading,
         currentPasswordTextFieldProps,
+        slots = {},
+        slotProps = {},
     } = props;
 
     const [currentInput, setCurrentInput] = useState('');
@@ -147,6 +149,7 @@ export const ChangePasswordDialog: React.FC<ChangePasswordDialogProps> = (props)
             onSubmit={async (): Promise<void> => {
                 await changePasswordSubmit();
             }}
+            slots={slots}
             slotProps={{
                 SuccessScreen: {
                     icon: <CheckCircle color="primary" sx={{ fontSize: 100 }} />,
@@ -164,6 +167,7 @@ export const ChangePasswordDialog: React.FC<ChangePasswordDialogProps> = (props)
                             onFinish();
                         },
                     },
+                    ...slotProps.SuccessScreen,
                 },
             }}
             showSuccessScreen={showSuccessScreen}
diff --git a/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialogBase.tsx b/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialogBase.tsx
index d271a589..65f7b819 100644
--- a/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialogBase.tsx
+++ b/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialogBase.tsx
@@ -154,7 +154,7 @@ export const ChangePasswordDialogBase: React.FC<ChangePasswordDialogProps> = (pr
                     <DialogActions
                         sx={{
                             justifyContent: 'flex-end',
-                            p: { md: 3, sm: 2 },
+                            p: { xs: 2, md: 3 },
                         }}
                     >
                         <Grid