diff --git a/packages/wallets/src/components/Base/WalletButton/WalletButton.scss b/packages/wallets/src/components/Base/WalletButton/WalletButton.scss
index 85ff27e1ac01..c809f4bd5d99 100644
--- a/packages/wallets/src/components/Base/WalletButton/WalletButton.scss
+++ b/packages/wallets/src/components/Base/WalletButton/WalletButton.scss
@@ -34,7 +34,7 @@ $size-map: (
 );
 
 .wallets-button {
-    display: inline-flex;
+    display: flex;
     justify-content: center;
     align-items: center;
     gap: 0.8rem;
diff --git a/packages/wallets/src/components/Base/WalletButton/WalletButton.tsx b/packages/wallets/src/components/Base/WalletButton/WalletButton.tsx
index cefdbc68322e..8f071639d47a 100644
--- a/packages/wallets/src/components/Base/WalletButton/WalletButton.tsx
+++ b/packages/wallets/src/components/Base/WalletButton/WalletButton.tsx
@@ -81,7 +81,7 @@ const WalletButton: React.FC<WalletButtonProps> = ({
     };
 
     const buttonFontSizeMapper = {
-        lg: 'sm',
+        lg: 'md',
         md: 'sm',
         sm: 'xs',
     } as const;
diff --git a/packages/wallets/src/components/SentEmailContent/SentEmailContent.tsx b/packages/wallets/src/components/SentEmailContent/SentEmailContent.tsx
index 73f0e06ff903..eeaffd26deda 100644
--- a/packages/wallets/src/components/SentEmailContent/SentEmailContent.tsx
+++ b/packages/wallets/src/components/SentEmailContent/SentEmailContent.tsx
@@ -14,6 +14,7 @@ import { WalletsActionScreen } from '../WalletsActionScreen';
 import './SentEmailContent.scss';
 
 type TProps = {
+    description?: string;
     platform?: TPlatforms.All;
 };
 
@@ -36,14 +37,16 @@ const REASONS = [
     },
 ];
 
-const SentEmailContent: React.FC<TProps> = ({ platform }) => {
+const SentEmailContent: React.FC<TProps> = ({ description, platform }) => {
     const [shouldShowResendEmailReasons, setShouldShowResendEmailReasons] = useState(false);
     const [hasCountdownStarted, setHasCountdownStarted] = useState(false);
     const { data } = useSettings();
     const { mutate: verifyEmail } = useVerifyEmail();
     const { isMobile } = useDevice();
     const title = PlatformDetails[platform || 'mt5'].title;
-    const deviceSize = isMobile ? 'lg' : 'md';
+    const titleSize = 'md';
+    const descriptionSize = 'sm';
+    const emailLinkSize = isMobile ? 'lg' : 'md';
     const [count, { resetCountdown, startCountdown }] = useCountdown({
         countStart: 60,
         intervalMs: 1000,
@@ -56,21 +59,21 @@ const SentEmailContent: React.FC<TProps> = ({ platform }) => {
     return (
         <div className='wallets-sent-email-content'>
             <WalletsActionScreen
-                description={`Please click on the link in the email to change your ${title} password.`}
-                descriptionSize={deviceSize}
+                description={description ?? `Please click on the link in the email to change your ${title} password.`}
+                descriptionSize={descriptionSize}
                 icon={<ChangePassword />}
                 renderButtons={() => (
                     <WalletButton
                         onClick={() => {
                             setShouldShowResendEmailReasons(true);
                         }}
-                        size={deviceSize}
+                        size={emailLinkSize}
                         text="Didn't receive the email?"
                         variant='ghost'
                     />
                 )}
                 title='We’ve sent you an email'
-                titleSize={deviceSize}
+                titleSize={titleSize}
             />
             {shouldShowResendEmailReasons && (
                 <div className='wallets-sent-email-content__reasons'>
diff --git a/packages/wallets/src/features/cfd/screens/ChangePassword/ChangePassword.scss b/packages/wallets/src/features/cfd/screens/ChangePassword/ChangePassword.scss
index 5787ac6145f5..0f50768eec6d 100644
--- a/packages/wallets/src/features/cfd/screens/ChangePassword/ChangePassword.scss
+++ b/packages/wallets/src/features/cfd/screens/ChangePassword/ChangePassword.scss
@@ -49,4 +49,26 @@
             }
         }
     }
+
+    &__investor-password {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        gap: 2.4rem;
+
+        &-fields {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            gap: 1.6rem;
+            min-width: 32.8rem;
+        }
+
+        &-buttons {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            gap: 1.6rem;
+        }
+    }
 }
diff --git a/packages/wallets/src/features/cfd/screens/ChangePassword/ChangePassword.tsx b/packages/wallets/src/features/cfd/screens/ChangePassword/ChangePassword.tsx
index 07939608a659..219ed1a2f81b 100644
--- a/packages/wallets/src/features/cfd/screens/ChangePassword/ChangePassword.tsx
+++ b/packages/wallets/src/features/cfd/screens/ChangePassword/ChangePassword.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { ModalStepWrapper, Tab, Tabs } from '../../../../components/Base';
+import MT5ChangeInvestorPasswordScreens from './MT5ChangeInvestorPasswordScreens';
 import MT5ChangePasswordScreens from './MT5ChangePasswordScreens';
 import './ChangePassword.scss';
 
@@ -12,8 +13,7 @@ const ChangePassword = () => {
                         <MT5ChangePasswordScreens />
                     </Tab>
                     <Tab title='Investor Password'>
-                        {/* TODO: Add Investor Password */}
-                        <></>
+                        <MT5ChangeInvestorPasswordScreens />
                     </Tab>
                 </Tabs>
             </div>
diff --git a/packages/wallets/src/features/cfd/screens/ChangePassword/MT5ChangeInvestorPasswordScreens.tsx b/packages/wallets/src/features/cfd/screens/ChangePassword/MT5ChangeInvestorPasswordScreens.tsx
new file mode 100644
index 000000000000..31bb51ba6e27
--- /dev/null
+++ b/packages/wallets/src/features/cfd/screens/ChangePassword/MT5ChangeInvestorPasswordScreens.tsx
@@ -0,0 +1,106 @@
+import React, { useState } from 'react';
+import {
+    SentEmailContent,
+    WalletButton,
+    WalletPasswordField,
+    WalletsActionScreen,
+    WalletText,
+} from '../../../../components';
+import { useModal } from '../../../../components/ModalProvider';
+import useDevice from '../../../../hooks/useDevice';
+import MT5PasswordUpdatedIcon from '../../../../public/images/ic-mt5-password-updated.svg';
+
+type TChangeInvestorPasswordScreenIndex = 'emailVerification' | 'introScreen' | 'savedScreen';
+
+const MT5ChangeInvestorPasswordScreens = () => {
+    const [currentInvestorPassword, setCurrentInvestorPassword] = useState('');
+    const [newInvestorPassword, setNewInvestorPassword] = useState('');
+
+    const [activeScreen, setActiveScreen] = useState<TChangeInvestorPasswordScreenIndex>('introScreen');
+    const handleClick = (nextScreen: TChangeInvestorPasswordScreenIndex) => setActiveScreen(nextScreen);
+
+    const { isMobile } = useDevice();
+    const { hide } = useModal();
+
+    const ChangeInvestorPasswordScreens = {
+        introScreen: {
+            bodyText: (
+                <>
+                    <WalletText size='sm'>
+                        Use this password to grant viewing access to another user. While they may view your trading
+                        account, they will not be able to trade or take any other actions.
+                    </WalletText>
+                    <WalletText size='sm'>
+                        If this is the first time you try to create a password, or you have forgotten your password,
+                        please reset it.
+                    </WalletText>
+                </>
+            ),
+            button: (
+                <div className='wallets-change-password__investor-password'>
+                    <div className='wallets-change-password__investor-password-fields'>
+                        <WalletPasswordField
+                            key='current_password'
+                            label={`Current investor password`}
+                            onChange={e => setCurrentInvestorPassword(e.target.value)}
+                            password={currentInvestorPassword}
+                        />
+                        <WalletPasswordField
+                            key='new_password'
+                            label={`New investor password`}
+                            onChange={e => setNewInvestorPassword(e.target.value)}
+                            password={newInvestorPassword}
+                        />
+                    </div>
+                    <div className='wallets-change-password__investor-password-buttons'>
+                        <WalletButton
+                            disabled={currentInvestorPassword.length < 8 || newInvestorPassword.length < 8}
+                            onClick={() => handleClick('savedScreen')}
+                            size={isMobile ? 'lg' : 'md'}
+                            text='Change investor password'
+                        />
+                        <WalletButton
+                            onClick={() => handleClick('emailVerification')}
+                            size={isMobile ? 'lg' : 'md'}
+                            text='Create or reset investor password'
+                            variant='ghost'
+                        />
+                    </div>
+                </div>
+            ),
+            headingText: undefined,
+            icon: undefined,
+        },
+        savedScreen: {
+            bodyText: (
+                <WalletText align='center' size='sm'>
+                    Your investor password has been changed.
+                </WalletText>
+            ),
+            button: <WalletButton onClick={() => hide()} size='lg' text='Okay' />,
+            headingText: 'Password saved',
+            icon: <MT5PasswordUpdatedIcon />,
+        },
+    };
+
+    if (activeScreen === 'emailVerification')
+        return (
+            <div className='wallets-change-password__sent-email-wrapper'>
+                <SentEmailContent description='Please click on the link in the email to reset your password.' />
+            </div>
+        );
+
+    return (
+        <div className='wallets-change-password__content'>
+            <WalletsActionScreen
+                description={ChangeInvestorPasswordScreens[activeScreen].bodyText}
+                descriptionSize='sm'
+                icon={ChangeInvestorPasswordScreens[activeScreen].icon}
+                renderButtons={() => ChangeInvestorPasswordScreens[activeScreen].button}
+                title={ChangeInvestorPasswordScreens[activeScreen].headingText}
+            />
+        </div>
+    );
+};
+
+export default MT5ChangeInvestorPasswordScreens;
diff --git a/packages/wallets/src/public/images/ic-mt5-password-updated.svg b/packages/wallets/src/public/images/ic-mt5-password-updated.svg
new file mode 100644
index 000000000000..afa6f50d015b
--- /dev/null
+++ b/packages/wallets/src/public/images/ic-mt5-password-updated.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 100 100" fill="none"><path d="M50.195 61.297c10.433 0 18.89-8.458 18.89-18.89 0-10.434-8.457-18.891-18.89-18.891s-18.89 8.457-18.89 18.89 8.457 18.89 18.89 18.89Z" fill="#C7E5E5"/><path d="M50.195 38.68a3.945 3.945 0 1 0 0-7.891 3.945 3.945 0 0 0 0 7.89Z" fill="#fff"/><path d="M41.195 59.023v7h4.157v5.446l-3.774 1.469v1.585l1.406 1.54v1.343l-1.007 1.008v2.172l3.375 2.148v6.688l4.976 4.984 5.649-5.656V60.398l-14.782-1.375Z" fill="#C7E5E5"/><path d="M51.125 65.648h2.04v22.329h-2.04V65.648Z" fill="#E0F4F3"/><path d="M47.18 3.125a15.922 15.922 0 0 0-15.93 15.922 15.684 15.684 0 0 0 4.547 11.133 24.155 24.155 0 0 1 1.914-1.922 12.651 12.651 0 0 1-3.719-9.18 13.188 13.188 0 1 1 13.149 13.149 3.734 3.734 0 0 0-.899 2.695c.313 0 .618.055.938.055 8.659-.192 15.577-7.266 15.577-15.926S55.84 3.316 47.18 3.125Z" fill="#BCCDCE"/><path d="M66.414 98.438c9.928 0 17.977-8.045 17.977-17.97 0-9.923-8.049-17.968-17.977-17.968s-17.977 8.045-17.977 17.969c0 9.924 8.049 17.969 17.977 17.969Z" fill="#84ABAE"/><path d="M65.156 86.234a.85.85 0 0 1-.531-.187l-4.734-3.906a.851.851 0 0 1-.118-1.18.838.838 0 0 1 1.18-.117l4.086 3.344 7.383-9.07a.836.836 0 1 1 1.297 1.054l-7.906 9.766a.845.845 0 0 1-.57.304l-.087-.008Z" fill="#fff"/></svg>
\ No newline at end of file