diff --git a/src/ONYXKEYS.js b/src/ONYXKEYS.js
index 1f47b414ee23..a3427cbe8ef1 100755
--- a/src/ONYXKEYS.js
+++ b/src/ONYXKEYS.js
@@ -46,9 +46,6 @@ export default {
     // Keeps track if there is modal currently visible or not
     MODAL: 'modal',
 
-    // Contains the personalDetails of the user as well as their timezone
-    MY_PERSONAL_DETAILS: 'myPersonalDetails',
-
     // Has information about the network status (offline/online)
     NETWORK: 'network',
 
diff --git a/src/components/IOUConfirmationList.js b/src/components/IOUConfirmationList.js
index 6f14ab005268..32c7ee6531c6 100755
--- a/src/components/IOUConfirmationList.js
+++ b/src/components/IOUConfirmationList.js
@@ -16,6 +16,7 @@ import SettlementButton from './SettlementButton';
 import ROUTES from '../ROUTES';
 import networkPropTypes from './networkPropTypes';
 import {withNetwork} from './OnyxProvider';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from './withCurrentUserPersonalDetails';
 
 const propTypes = {
     /** Callback to inform parent modal of success */
@@ -63,20 +64,9 @@ const propTypes = {
 
     ...withLocalizePropTypes,
 
-    /* Onyx Props */
-
-    /** The personal details of the person who is logged in */
-    myPersonalDetails: PropTypes.shape({
-
-        /** Display name of the current user from their personal details */
-        displayName: PropTypes.string,
-
-        /** Avatar URL of the current user from their personal details */
-        avatar: PropTypes.string,
+    ...withCurrentUserPersonalDetailsPropTypes,
 
-        /** Primary login of the user */
-        login: PropTypes.string,
-    }),
+    /* Onyx Props */
 
     /** Holds data related to IOU view state, rather than the underlying IOU data. */
     iou: PropTypes.shape({
@@ -103,8 +93,8 @@ const defaultProps = {
     },
     onUpdateComment: null,
     comment: '',
-    myPersonalDetails: {},
     iouType: CONST.IOU.IOU_TYPE.REQUEST,
+    ...withCurrentUserPersonalDetailsDefaultProps,
 };
 
 class IOUConfirmationList extends Component {
@@ -190,7 +180,7 @@ class IOUConfirmationList extends Component {
             const formattedParticipants = _.union(formattedSelectedParticipants, formattedUnselectedParticipants);
 
             const formattedMyPersonalDetails = OptionsListUtils.getIOUConfirmationOptionsFromMyPersonalDetail(
-                this.props.myPersonalDetails,
+                this.props.currentUserPersonalDetails,
                 this.props.numberFormat(this.calculateAmount(selectedParticipants, true) / 100, {
                     style: 'currency',
                     currency: this.props.iou.selectedCurrencyCode,
@@ -246,7 +236,7 @@ class IOUConfirmationList extends Component {
         }));
 
         splits.push({
-            email: OptionsListUtils.addSMSDomainIfPhoneNumber(this.props.myPersonalDetails.login),
+            email: OptionsListUtils.addSMSDomainIfPhoneNumber(this.props.currentUserPersonalDetails.login),
 
             // The user is default and we should send in cents to API
             // USD is temporary and there must be support for other currencies in the future
@@ -266,7 +256,7 @@ class IOUConfirmationList extends Component {
         const selectedParticipants = this.getSelectedParticipants();
         return [
             ...selectedParticipants,
-            OptionsListUtils.getIOUConfirmationOptionsFromMyPersonalDetail(this.props.myPersonalDetails),
+            OptionsListUtils.getIOUConfirmationOptionsFromMyPersonalDetail(this.props.currentUserPersonalDetails),
         ];
     }
 
@@ -395,11 +385,9 @@ export default compose(
     withLocalize,
     withWindowDimensions,
     withNetwork(),
+    withCurrentUserPersonalDetails,
     withOnyx({
         iou: {key: ONYXKEYS.IOU},
-        myPersonalDetails: {
-            key: ONYXKEYS.MY_PERSONAL_DETAILS,
-        },
         session: {
             key: ONYXKEYS.SESSION,
         },
diff --git a/src/components/withCurrentUserPersonalDetails.js b/src/components/withCurrentUserPersonalDetails.js
new file mode 100644
index 000000000000..65b695fc06ce
--- /dev/null
+++ b/src/components/withCurrentUserPersonalDetails.js
@@ -0,0 +1,72 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {withOnyx} from 'react-native-onyx';
+import getComponentDisplayName from '../libs/getComponentDisplayName';
+import ONYXKEYS from '../ONYXKEYS';
+import personalDetailsPropType from '../pages/personalDetailsPropType';
+
+const withCurrentUserPersonalDetailsPropTypes = {
+    currentUserPersonalDetails: personalDetailsPropType,
+};
+
+const withCurrentUserPersonalDetailsDefaultProps = {
+    currentUserPersonalDetails: {},
+};
+
+export default function (WrappedComponent) {
+    const WithCurrentUserPersonalDetails = (props) => {
+        const currentUserEmail = props.session.email;
+
+        return (
+            <WrappedComponent
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+                ref={props.forwardedRef}
+                currentUserPersonalDetails={props.personalDetails[currentUserEmail]}
+            />
+        );
+    };
+
+    WithCurrentUserPersonalDetails.displayName = `WithCurrentUserPersonalDetails(${getComponentDisplayName(WrappedComponent)})`;
+    WithCurrentUserPersonalDetails.propTypes = {
+        forwardedRef: PropTypes.oneOfType([
+            PropTypes.func,
+            PropTypes.shape({current: PropTypes.instanceOf(React.Component)}),
+        ]),
+
+        /** Personal details of all the users, including current user */
+        personalDetails: PropTypes.objectOf(personalDetailsPropType),
+
+        /** Session of the current user */
+        session: PropTypes.shape({
+            email: PropTypes.string,
+        }),
+    };
+
+    WithCurrentUserPersonalDetails.defaultProps = {
+        forwardedRef: undefined,
+        personalDetails: {},
+        session: {
+            email: '',
+        },
+    };
+
+    const withCurrentUserPersonalDetails = React.forwardRef((props, ref) => (
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        <WithCurrentUserPersonalDetails {...props} forwardedRef={ref} />
+    ));
+
+    return withOnyx({
+        personalDetails: {
+            key: ONYXKEYS.PERSONAL_DETAILS,
+        },
+        session: {
+            key: ONYXKEYS.SESSION,
+        },
+    })(withCurrentUserPersonalDetails);
+}
+
+export {
+    withCurrentUserPersonalDetailsPropTypes,
+    withCurrentUserPersonalDetailsDefaultProps,
+};
diff --git a/src/libs/DateUtils.js b/src/libs/DateUtils.js
index 256c9938f805..522b2500a519 100644
--- a/src/libs/DateUtils.js
+++ b/src/libs/DateUtils.js
@@ -12,11 +12,24 @@ import * as Localize from './Localize';
 import * as PersonalDetails from './actions/PersonalDetails';
 import * as CurrentDate from './actions/CurrentDate';
 
+let currentUserEmail;
+Onyx.connect({
+    key: ONYXKEYS.SESSION,
+    callback: (val) => {
+        // When signed out, val is undefined
+        if (!val) {
+            return;
+        }
+
+        currentUserEmail = val.email;
+    },
+});
+
 let timezone = CONST.DEFAULT_TIME_ZONE;
 Onyx.connect({
-    key: ONYXKEYS.MY_PERSONAL_DETAILS,
+    key: ONYXKEYS.PERSONAL_DETAILS,
     callback: (val) => {
-        timezone = lodashGet(val, 'timezone', CONST.DEFAULT_TIME_ZONE);
+        timezone = lodashGet(val, currentUserEmail, 'timezone', CONST.DEFAULT_TIME_ZONE);
     },
 });
 
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js
index 01b2fa3ab097..13920d1c6dd4 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.js
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.js
@@ -40,14 +40,27 @@ import LogOutPreviousUserPage from '../../../pages/LogOutPreviousUserPage';
 import networkPropTypes from '../../../components/networkPropTypes';
 import {withNetwork} from '../../../components/OnyxProvider';
 
+let currentUserEmail;
 Onyx.connect({
-    key: ONYXKEYS.MY_PERSONAL_DETAILS,
+    key: ONYXKEYS.SESSION,
     callback: (val) => {
+        // When signed out, val is undefined
         if (!val) {
             return;
         }
 
-        const timezone = lodashGet(val, 'timezone', {});
+        currentUserEmail = val.email;
+    },
+});
+
+Onyx.connect({
+    key: ONYXKEYS.PERSONAL_DETAILS,
+    callback: (val) => {
+        if (!val) {
+            return;
+        }
+
+        const timezone = lodashGet(val, currentUserEmail, 'timezone', {});
         const currentTimezone = moment.tz.guess(true);
 
         // If the current timezone is different than the user's timezone, and their timezone is set to automatic
diff --git a/src/libs/actions/PersonalDetails.js b/src/libs/actions/PersonalDetails.js
index cc7add84320e..5585082c0e7a 100644
--- a/src/libs/actions/PersonalDetails.js
+++ b/src/libs/actions/PersonalDetails.js
@@ -125,8 +125,6 @@ function fetchPersonalDetails() {
         returnValueList: 'personalDetailsList',
     })
         .then((data) => {
-            let myPersonalDetails = {};
-
             // If personalDetailsList does not have the current user ensure we initialize their details with an empty
             // object at least
             const personalDetailsList = _.isEmpty(data.personalDetailsList) ? {} : data.personalDetailsList;
@@ -136,15 +134,6 @@ function fetchPersonalDetails() {
 
             const allPersonalDetails = formatPersonalDetails(personalDetailsList);
             Onyx.merge(ONYXKEYS.PERSONAL_DETAILS, allPersonalDetails);
-
-            myPersonalDetails = allPersonalDetails[currentUserEmail];
-
-            // Add the first and last name to the current user's MY_PERSONAL_DETAILS key
-            myPersonalDetails.firstName = lodashGet(data.personalDetailsList, [currentUserEmail, 'firstName'], '');
-            myPersonalDetails.lastName = lodashGet(data.personalDetailsList, [currentUserEmail, 'lastName'], '');
-
-            // Set my personal details so they can be easily accessed and subscribed to on their own key
-            Onyx.merge(ONYXKEYS.MY_PERSONAL_DETAILS, myPersonalDetails);
         });
 }
 
@@ -262,8 +251,6 @@ function mergeLocalPersonalDetails(details) {
     // displayName is a generated field so we'll use the firstName and lastName + login to update it.
     mergedDetails.displayName = getDisplayName(currentUserEmail, mergedDetails);
 
-    // Update the associated Onyx keys
-    Onyx.merge(ONYXKEYS.MY_PERSONAL_DETAILS, mergedDetails);
     Onyx.merge(ONYXKEYS.PERSONAL_DETAILS, {[currentUserEmail]: mergedDetails});
 }
 
@@ -325,7 +312,7 @@ function fetchLocalCurrency() {
         })
         .then(getCurrencyList)
         .then(() => {
-            Onyx.merge(ONYXKEYS.MY_PERSONAL_DETAILS, {localCurrencyCode: currency});
+            Onyx.merge(ONYXKEYS.PERSONAL_DETAILS, {[currentUserEmail]: {localCurrencyCode: currency}});
         })
         .finally(() => {
             Onyx.merge(ONYXKEYS.IOU, {
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 36fd0c06eed2..ccf501905c48 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -52,8 +52,8 @@ Onyx.connect({
 
 let myPersonalDetails;
 Onyx.connect({
-    key: ONYXKEYS.MY_PERSONAL_DETAILS,
-    callback: val => myPersonalDetails = val,
+    key: ONYXKEYS.PERSONAL_DETAILS,
+    callback: val => myPersonalDetails = val[currentUserEmail],
 });
 
 const allReports = {};
diff --git a/src/pages/EnablePayments/AdditionalDetailsStep.js b/src/pages/EnablePayments/AdditionalDetailsStep.js
index 7d9dbcfe706d..2f3937ce1745 100644
--- a/src/pages/EnablePayments/AdditionalDetailsStep.js
+++ b/src/pages/EnablePayments/AdditionalDetailsStep.js
@@ -28,11 +28,12 @@ import AddressSearch from '../../components/AddressSearch';
 import DatePicker from '../../components/DatePicker';
 import FormHelper from '../../libs/FormHelper';
 import walletAdditionalDetailsDraftPropTypes from './walletAdditionalDetailsDraftPropTypes';
-import personalDetailsPropType from '../personalDetailsPropType';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../../components/withCurrentUserPersonalDetails';
 import * as PersonalDetails from '../../libs/actions/PersonalDetails';
 
 const propTypes = {
     ...withLocalizePropTypes,
+    ...withCurrentUserPersonalDetailsPropTypes,
 
     /** Stores additional information about the additional details step e.g. loading state and errors with fields */
     walletAdditionalDetails: PropTypes.shape({
@@ -61,9 +62,6 @@ const propTypes = {
 
     /** Stores the personal details typed by the user */
     walletAdditionalDetailsDraft: walletAdditionalDetailsDraftPropTypes,
-
-    /** The personal details of the person who is logged in */
-    myPersonalDetails: personalDetailsPropType.isRequired,
 };
 
 const defaultProps = {
@@ -86,6 +84,7 @@ const defaultProps = {
         dob: '',
         ssn: '',
     },
+    ...withCurrentUserPersonalDetailsDefaultProps,
 };
 
 class AdditionalDetailsStep extends React.Component {
@@ -275,7 +274,7 @@ class AdditionalDetailsStep extends React.Component {
         const isErrorVisible = _.size(this.getErrors()) > 0
             || lodashGet(this.props, 'walletAdditionalDetails.additionalErrorMessage', '').length > 0;
         const shouldAskForFullSSN = this.props.walletAdditionalDetails.shouldAskForFullSSN;
-        const {firstName, lastName} = PersonalDetails.extractFirstAndLastNameFromAvailableDetails(this.props.myPersonalDetails);
+        const {firstName, lastName} = PersonalDetails.extractFirstAndLastNameFromAvailableDetails(this.props.currentUserPersonalDetails);
 
         return (
             <ScreenWrapper>
@@ -407,13 +406,11 @@ AdditionalDetailsStep.propTypes = propTypes;
 AdditionalDetailsStep.defaultProps = defaultProps;
 export default compose(
     withLocalize,
+    withCurrentUserPersonalDetails,
     withOnyx({
         walletAdditionalDetails: {
             key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
             initWithStoredValues: false,
         },
-        myPersonalDetails: {
-            key: ONYXKEYS.MY_PERSONAL_DETAILS,
-        },
     }),
 )(AdditionalDetailsStep);
diff --git a/src/pages/RequestCallPage.js b/src/pages/RequestCallPage.js
index 7b3019b246ed..8b2dbb7f7a93 100644
--- a/src/pages/RequestCallPage.js
+++ b/src/pages/RequestCallPage.js
@@ -19,7 +19,7 @@ import Icon from '../components/Icon';
 import CONST from '../CONST';
 import Growl from '../libs/Growl';
 import * as Inbox from '../libs/actions/Inbox';
-import personalDetailsPropType from './personalDetailsPropType';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../components/withCurrentUserPersonalDetails';
 import TextInput from '../components/TextInput';
 import Text from '../components/Text';
 import Section from '../components/Section';
@@ -38,9 +38,7 @@ import FormAlertWithSubmitButton from '../components/FormAlertWithSubmitButton';
 
 const propTypes = {
     ...withLocalizePropTypes,
-
-    /** The personal details of the person who is logged in */
-    myPersonalDetails: personalDetailsPropType.isRequired,
+    ...withCurrentUserPersonalDetailsPropTypes,
 
     /** Login list for the user that is signed in */
     loginList: PropTypes.arrayOf(PropTypes.shape({
@@ -101,12 +99,13 @@ const defaultProps = {
     lastAccessedWorkspacePolicyID: '',
     blockedFromConcierge: {},
     loginList: [],
+    ...withCurrentUserPersonalDetailsDefaultProps,
 };
 
 class RequestCallPage extends Component {
     constructor(props) {
         super(props);
-        const {firstName, lastName} = PersonalDetails.extractFirstAndLastNameFromAvailableDetails(props.myPersonalDetails);
+        const {firstName, lastName} = PersonalDetails.extractFirstAndLastNameFromAvailableDetails(props.currentUserPersonalDetails);
         this.state = {
             firstName,
             hasFirstNameError: false,
@@ -377,10 +376,8 @@ RequestCallPage.defaultProps = defaultProps;
 export default compose(
     withLocalize,
     withNetwork(),
+    withCurrentUserPersonalDetails,
     withOnyx({
-        myPersonalDetails: {
-            key: ONYXKEYS.MY_PERSONAL_DETAILS,
-        },
         loginList: {
             key: ONYXKEYS.LOGIN_LIST,
         },
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 0f6ed0e9ea1f..141d9c9232a0 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -35,6 +35,7 @@ import ReportActionComposeFocusManager from '../../../libs/ReportActionComposeFo
 import participantPropTypes from '../../../components/participantPropTypes';
 import ParticipantLocalTime from './ParticipantLocalTime';
 import {withPersonalDetails} from '../../../components/OnyxProvider';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../../../components/withCurrentUserPersonalDetails';
 import * as User from '../../../libs/actions/User';
 import Tooltip from '../../../components/Tooltip';
 import EmojiPickerButton from '../../../components/EmojiPicker/EmojiPickerButton';
@@ -95,14 +96,9 @@ const propTypes = {
         expiresAt: PropTypes.string,
     }),
 
-    /** The personal details of the person who is logged in */
-    myPersonalDetails: PropTypes.shape({
-        /** Primary login of the user */
-        login: PropTypes.string,
-    }),
-
     ...windowDimensionsPropTypes,
     ...withLocalizePropTypes,
+    ...withCurrentUserPersonalDetailsPropTypes,
 };
 
 const defaultProps = {
@@ -112,7 +108,7 @@ const defaultProps = {
     reportActions: {},
     blockedFromConcierge: {},
     personalDetails: {},
-    myPersonalDetails: {},
+    ...withCurrentUserPersonalDetailsDefaultProps,
 };
 
 class ReportActionCompose extends React.Component {
@@ -262,7 +258,7 @@ class ReportActionCompose extends React.Component {
      * @returns {Array<object>}
      */
     getIOUOptions(reportParticipants) {
-        const participants = _.filter(reportParticipants, email => this.props.myPersonalDetails.login !== email);
+        const participants = _.filter(reportParticipants, email => this.props.currentUserPersonalDetails.login !== email);
         const hasExcludedIOUEmails = lodashIntersection(reportParticipants, CONST.EXPENSIFY_EMAILS).length > 0;
         const hasMultipleParticipants = participants.length > 1;
         const iouOptions = [];
@@ -690,6 +686,7 @@ export default compose(
     withNavigationFocus,
     withLocalize,
     withPersonalDetails(),
+    withCurrentUserPersonalDetails,
     withOnyx({
         betas: {
             key: ONYXKEYS.BETAS,
@@ -703,8 +700,5 @@ export default compose(
         blockedFromConcierge: {
             key: ONYXKEYS.NVP_BLOCKED_FROM_CONCIERGE,
         },
-        myPersonalDetails: {
-            key: ONYXKEYS.MY_PERSONAL_DETAILS,
-        },
     }),
 )(ReportActionCompose);
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index 9021bbc6674e..6e2f425d303b 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -27,6 +27,7 @@ import * as App from '../../../libs/actions/App';
 import * as ReportUtils from '../../../libs/ReportUtils';
 import networkPropTypes from '../../../components/networkPropTypes';
 import {withNetwork} from '../../../components/OnyxProvider';
+import withCurrentUserPersonalDetails from '../../../components/withCurrentUserPersonalDetails';
 
 const propTypes = {
     /** Toggles the navigation menu open and closed */
@@ -58,7 +59,7 @@ const propTypes = {
     personalDetails: PropTypes.objectOf(participantPropTypes),
 
     /** The personal details of the person who is logged in */
-    myPersonalDetails: PropTypes.shape({
+    currentUserPersonalDetails: PropTypes.shape({
         /** Display name of the current user from their personal details */
         displayName: PropTypes.string,
 
@@ -91,7 +92,7 @@ const defaultProps = {
     reports: {},
     reportsWithDraft: {},
     personalDetails: {},
-    myPersonalDetails: {
+    currentUserPersonalDetails: {
         avatar: ReportUtils.getDefaultAvatar(),
     },
     currentlyViewedReportID: '',
@@ -172,6 +173,7 @@ class SidebarLinks extends React.Component {
 
     constructor(props) {
         super(props);
+
         this.state = {
             activeReport: {
                 reportID: props.currentlyViewedReportID,
@@ -287,7 +289,7 @@ class SidebarLinks extends React.Component {
                         onPress={this.props.onAvatarClick}
                     >
                         <AvatarWithIndicator
-                            source={this.props.myPersonalDetails.avatar}
+                            source={this.props.currentUserPersonalDetails.avatar}
                             isActive={this.props.network && !this.props.network.isOffline}
                             isSyncing={this.props.network && !this.props.network.isOffline && this.props.isSyncingData}
                             tooltipText={this.props.translate('common.settings')}
@@ -326,6 +328,7 @@ SidebarLinks.defaultProps = defaultProps;
 export default compose(
     withLocalize,
     withNetwork(),
+    withCurrentUserPersonalDetails,
     withOnyx({
         reports: {
             key: ONYXKEYS.COLLECTION.REPORT,
@@ -333,9 +336,6 @@ export default compose(
         personalDetails: {
             key: ONYXKEYS.PERSONAL_DETAILS,
         },
-        myPersonalDetails: {
-            key: ONYXKEYS.MY_PERSONAL_DETAILS,
-        },
         currentlyViewedReportID: {
             key: ONYXKEYS.CURRENTLY_VIEWED_REPORTID,
         },
diff --git a/src/pages/iou/IOUModal.js b/src/pages/iou/IOUModal.js
index 7a187fd56d77..cc0d33b76722 100755
--- a/src/pages/iou/IOUModal.js
+++ b/src/pages/iou/IOUModal.js
@@ -25,6 +25,7 @@ import Tooltip from '../../components/Tooltip';
 import CONST from '../../CONST';
 import KeyboardAvoidingView from '../../components/KeyboardAvoidingView';
 import * as PersonalDetails from '../../libs/actions/PersonalDetails';
+import withCurrentUserPersonalDetails from '../../components/withCurrentUserPersonalDetails';
 import ROUTES from '../../ROUTES';
 import networkPropTypes from '../../components/networkPropTypes';
 import {withNetwork} from '../../components/OnyxProvider';
@@ -45,13 +46,6 @@ const propTypes = {
         participants: PropTypes.arrayOf(PropTypes.string),
     }),
 
-    // The personal details of the person who is logged in
-    myPersonalDetails: PropTypes.shape({
-
-        // Local Currency Code of the current user
-        localCurrencyCode: PropTypes.string,
-    }),
-
     /** Information about the network */
     network: networkPropTypes.isRequired,
 
@@ -82,6 +76,12 @@ const propTypes = {
         avatar: PropTypes.string,
     }).isRequired,
 
+    /** Personal details of the current user */
+    currentUserPersonalDetails: PropTypes.shape({
+        // Local Currency Code of the current user
+        localCurrencyCode: PropTypes.string,
+    }),
+
     ...withLocalizePropTypes,
 };
 
@@ -90,10 +90,10 @@ const defaultProps = {
     report: {
         participants: [],
     },
-    myPersonalDetails: {
+    iouType: CONST.IOU.IOU_TYPE.REQUEST,
+    currentUserPersonalDetails: {
         localCurrencyCode: CONST.CURRENCY.USD,
     },
-    iouType: CONST.IOU.IOU_TYPE.REQUEST,
 };
 
 // Determines type of step to display within Modal, value provides the title for that page.
@@ -112,6 +112,7 @@ class IOUModal extends Component {
         this.createTransaction = this.createTransaction.bind(this);
         this.updateComment = this.updateComment.bind(this);
         this.sendMoney = this.sendMoney.bind(this);
+
         const participants = lodashGet(props, 'report.participants', []);
         const participantsWithDetails = _.map(OptionsListUtils.getPersonalDetailsForLogins(participants, props.personalDetails), personalDetails => ({
             login: personalDetails.login,
@@ -144,7 +145,7 @@ class IOUModal extends Component {
 
     componentDidMount() {
         this.fetchData();
-        IOU.setIOUSelectedCurrency(this.props.myPersonalDetails.localCurrencyCode);
+        IOU.setIOUSelectedCurrency(this.props.currentUserPersonalDetails.localCurrencyCode);
     }
 
     componentDidUpdate(prevProps) {
@@ -442,7 +443,7 @@ class IOUModal extends Component {
                                                 onConfirm={this.createTransaction}
                                                 onSendMoney={this.sendMoney}
                                                 hasMultipleParticipants={this.props.hasMultipleParticipants}
-                                                participants={_.filter(this.state.participants, email => this.props.myPersonalDetails.login !== email.login)}
+                                                participants={_.filter(this.state.participants, email => this.props.currentUserPersonalDetails.login !== email.login)}
                                                 iouAmount={this.state.amount}
                                                 comment={this.state.comment}
                                                 onUpdateComment={this.updateComment}
@@ -467,6 +468,7 @@ IOUModal.defaultProps = defaultProps;
 export default compose(
     withLocalize,
     withNetwork(),
+    withCurrentUserPersonalDetails,
     withOnyx({
         report: {
             key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
@@ -477,8 +479,5 @@ export default compose(
         personalDetails: {
             key: ONYXKEYS.PERSONAL_DETAILS,
         },
-        myPersonalDetails: {
-            key: ONYXKEYS.MY_PERSONAL_DETAILS,
-        },
     }),
 )(IOUModal);
diff --git a/src/pages/personalDetailsPropType.js b/src/pages/personalDetailsPropType.js
index 43bfe5e61261..809dd44ce09f 100644
--- a/src/pages/personalDetailsPropType.js
+++ b/src/pages/personalDetailsPropType.js
@@ -13,14 +13,24 @@ export default PropTypes.shape({
     // Avatar URL of the current user from their personal details
     avatar: PropTypes.string,
 
+    // Flag to set when Avatar uploading
+    avatarUploading: PropTypes.bool,
+
     // login of the current user from their personal details
     login: PropTypes.string,
 
     // pronouns of the current user from their personal details
     pronouns: PropTypes.string,
 
+    // local currency for the user
+    localCurrencyCode: PropTypes.string,
+
     // timezone of the current user from their personal details
     timezone: PropTypes.shape({
+        // Value of selected timezone
         selected: PropTypes.string,
+
+        // Whether timezone is automatically set
+        automatic: PropTypes.bool,
     }),
 });
diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js
index 209c84bb921f..6d1996630d5c 100755
--- a/src/pages/settings/InitialSettingsPage.js
+++ b/src/pages/settings/InitialSettingsPage.js
@@ -23,19 +23,11 @@ import DateUtils from '../../libs/DateUtils';
 import Permissions from '../../libs/Permissions';
 import networkPropTypes from '../../components/networkPropTypes';
 import {withNetwork} from '../../components/OnyxProvider';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../../components/withCurrentUserPersonalDetails';
 
 const propTypes = {
     /* Onyx Props */
 
-    /** The personal details of the person who is logged in */
-    myPersonalDetails: PropTypes.shape({
-        /** Display name of the current user from their personal details */
-        displayName: PropTypes.string,
-
-        /** Avatar URL of the current user from their personal details */
-        avatar: PropTypes.string,
-    }),
-
     /** Information about the network */
     network: networkPropTypes.isRequired,
 
@@ -70,16 +62,17 @@ const propTypes = {
     betas: PropTypes.arrayOf(PropTypes.string),
 
     ...withLocalizePropTypes,
+    ...withCurrentUserPersonalDetailsPropTypes,
 };
 
 const defaultProps = {
-    myPersonalDetails: {},
     session: {},
     policies: {},
     userWallet: {
         currentBalance: 0,
     },
     betas: [],
+    ...withCurrentUserPersonalDetailsDefaultProps,
 };
 
 const defaultMenuItems = [
@@ -127,7 +120,7 @@ const InitialSettingsPage = (props) => {
     // On the very first sign in or after clearing storage these
     // details will not be present on the first render so we'll just
     // return nothing for now.
-    if (_.isEmpty(props.myPersonalDetails)) {
+    if (_.isEmpty(props.currentUserPersonalDetails)) {
         return null;
     }
 
@@ -160,20 +153,20 @@ const InitialSettingsPage = (props) => {
                         <Pressable style={[styles.mb3]} onPress={openProfileSettings}>
                             <AvatarWithIndicator
                                 size={CONST.AVATAR_SIZE.LARGE}
-                                source={props.myPersonalDetails.avatar}
+                                source={props.currentUserPersonalDetails.avatar}
                                 isActive={props.network.isOffline === false}
-                                tooltipText={props.myPersonalDetails.displayName}
+                                tooltipText={props.currentUserPersonalDetails.displayName}
                             />
                         </Pressable>
 
                         <Pressable style={[styles.mt1, styles.mw100]} onPress={openProfileSettings}>
                             <Text style={[styles.displayName]} numberOfLines={1}>
-                                {props.myPersonalDetails.displayName
-                                    ? props.myPersonalDetails.displayName
+                                {props.currentUserPersonalDetails.displayName
+                                    ? props.currentUserPersonalDetails.displayName
                                     : Str.removeSMSDomain(props.session.email)}
                             </Text>
                         </Pressable>
-                        {props.myPersonalDetails.displayName && (
+                        {props.currentUserPersonalDetails.displayName && (
                             <Text
                                 style={[styles.textLabelSupporting, styles.mt1]}
                                 numberOfLines={1}
@@ -213,10 +206,8 @@ InitialSettingsPage.displayName = 'InitialSettingsPage';
 export default compose(
     withLocalize,
     withNetwork(),
+    withCurrentUserPersonalDetails,
     withOnyx({
-        myPersonalDetails: {
-            key: ONYXKEYS.MY_PERSONAL_DETAILS,
-        },
         session: {
             key: ONYXKEYS.SESSION,
         },
diff --git a/src/pages/settings/Profile/ProfilePage.js b/src/pages/settings/Profile/ProfilePage.js
index fbeb7b69b16c..ddd59b58d105 100755
--- a/src/pages/settings/Profile/ProfilePage.js
+++ b/src/pages/settings/Profile/ProfilePage.js
@@ -26,16 +26,13 @@ import Picker from '../../../components/Picker';
 import FullNameInputRow from '../../../components/FullNameInputRow';
 import CheckboxWithLabel from '../../../components/CheckboxWithLabel';
 import AvatarWithImagePicker from '../../../components/AvatarWithImagePicker';
-import currentUserPersonalDetailsPropsTypes from './currentUserPersonalDetailsPropsTypes';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../../../components/withCurrentUserPersonalDetails';
 import * as ValidationUtils from '../../../libs/ValidationUtils';
 import * as ReportUtils from '../../../libs/ReportUtils';
 
 const propTypes = {
     /* Onyx Props */
 
-    /** The personal details of the person who is logged in */
-    myPersonalDetails: PropTypes.shape(currentUserPersonalDetailsPropsTypes),
-
     /** Login list for the user that is signed in */
     loginList: PropTypes.arrayOf(PropTypes.shape({
 
@@ -49,11 +46,12 @@ const propTypes = {
         validatedDate: PropTypes.string,
     })),
     ...withLocalizePropTypes,
+    ...withCurrentUserPersonalDetailsPropTypes,
 };
 
 const defaultProps = {
-    myPersonalDetails: {},
     loginList: [],
+    ...withCurrentUserPersonalDetailsDefaultProps,
 };
 
 const timezones = _.chain(moment.tz.names())
@@ -68,20 +66,20 @@ class ProfilePage extends Component {
     constructor(props) {
         super(props);
 
-        this.defaultAvatar = ReportUtils.getDefaultAvatar(this.props.myPersonalDetails.login);
+        this.defaultAvatar = ReportUtils.getDefaultAvatar(this.props.currentUserPersonalDetails.login);
 
         this.state = {
-            firstName: props.myPersonalDetails.firstName,
+            firstName: this.props.currentUserPersonalDetails.firstName,
             hasFirstNameError: false,
-            lastName: props.myPersonalDetails.lastName,
+            lastName: this.props.currentUserPersonalDetails.lastName,
             hasLastNameError: false,
-            pronouns: props.myPersonalDetails.pronouns,
+            pronouns: this.props.currentUserPersonalDetails.pronouns,
             hasPronounError: false,
-            hasSelfSelectedPronouns: !_.isEmpty(props.myPersonalDetails.pronouns) && !props.myPersonalDetails.pronouns.startsWith(CONST.PRONOUNS.PREFIX),
-            selectedTimezone: lodashGet(props.myPersonalDetails.timezone, 'selected', CONST.DEFAULT_TIME_ZONE.selected),
-            isAutomaticTimezone: lodashGet(props.myPersonalDetails.timezone, 'automatic', CONST.DEFAULT_TIME_ZONE.automatic),
+            hasSelfSelectedPronouns: !_.isEmpty(this.props.currentUserPersonalDetails.pronouns) && !this.props.currentUserPersonalDetails.pronouns.startsWith(CONST.PRONOUNS.PREFIX),
+            selectedTimezone: lodashGet(this.props.currentUserPersonalDetails.timezone, 'selected', CONST.DEFAULT_TIME_ZONE.selected),
+            isAutomaticTimezone: lodashGet(this.props.currentUserPersonalDetails.timezone, 'automatic', CONST.DEFAULT_TIME_ZONE.automatic),
             logins: this.getLogins(props.loginList),
-            avatar: {uri: lodashGet(this.props.myPersonalDetails, 'avatar', ReportUtils.getDefaultAvatar(this.props.myPersonalDetails.login))},
+            avatar: {uri: lodashGet(this.props.currentUserPersonalDetails, 'avatar', ReportUtils.getDefaultAvatar(this.props.currentUserPersonalDetails.login))},
             isAvatarChanged: false,
         };
 
@@ -132,7 +130,7 @@ class ProfilePage extends Component {
             const login = Str.removeSMSDomain(currentLogin.partnerUserID);
 
             // If there's already a login type that's validated and/or currentLogin isn't valid then return early
-            if ((login !== this.props.myPersonalDetails.login) && !_.isEmpty(logins[type])
+            if ((login !== this.props.currentUserPersonalDetails.login) && !_.isEmpty(logins[type])
                 && (logins[type].validatedDate || !currentLogin.validatedDate)) {
                 return logins;
             }
@@ -155,7 +153,7 @@ class ProfilePage extends Component {
      * @param {Object} avatar
      */
     updateAvatar(avatar) {
-        this.setState({avatar: _.isUndefined(avatar) ? {uri: ReportUtils.getDefaultAvatar(this.props.myPersonalDetails.login)} : avatar, isAvatarChanged: true});
+        this.setState({avatar: _.isUndefined(avatar) ? {uri: ReportUtils.getDefaultAvatar(this.props.currentUserPersonalDetails.login)} : avatar, isAvatarChanged: true});
     }
 
     /**
@@ -167,7 +165,7 @@ class ProfilePage extends Component {
         }
 
         // Check if the user has modified their avatar
-        if ((this.props.myPersonalDetails.avatar !== this.state.avatar.uri) && this.state.isAvatarChanged) {
+        if ((this.props.currentUserPersonalDetails.avatar !== this.state.avatar.uri) && this.state.isAvatarChanged) {
             // If the user removed their profile photo, replace it accordingly with the default avatar
             if (this.state.avatar.uri.includes('/images/avatars/avatar')) {
                 PersonalDetails.deleteAvatar(this.state.avatar.uri);
@@ -210,12 +208,12 @@ class ProfilePage extends Component {
         }));
 
         // Disables button if none of the form values have changed
-        const isButtonDisabled = (this.props.myPersonalDetails.firstName === this.state.firstName.trim())
-            && (this.props.myPersonalDetails.lastName === this.state.lastName.trim())
-            && (this.props.myPersonalDetails.timezone.selected === this.state.selectedTimezone)
-            && (this.props.myPersonalDetails.timezone.automatic === this.state.isAutomaticTimezone)
-            && (this.props.myPersonalDetails.pronouns === this.state.pronouns.trim())
-            && (!this.state.isAvatarChanged || this.props.myPersonalDetails.avatarUploading);
+        const isButtonDisabled = (this.props.currentUserPersonalDetails.firstName === this.state.firstName.trim())
+            && (this.props.currentUserPersonalDetails.lastName === this.state.lastName.trim())
+            && (this.props.currentUserPersonalDetails.timezone.selected === this.state.selectedTimezone)
+            && (this.props.currentUserPersonalDetails.timezone.automatic === this.state.isAutomaticTimezone)
+            && (this.props.currentUserPersonalDetails.pronouns === this.state.pronouns.trim())
+            && (!this.state.isAvatarChanged || this.props.currentUserPersonalDetails.avatarUploading);
 
         const pronounsPickerValue = this.state.hasSelfSelectedPronouns ? CONST.PRONOUNS.SELF_SELECT : this.state.pronouns;
 
@@ -230,7 +228,7 @@ class ProfilePage extends Component {
                     />
                     <ScrollView style={styles.flex1} contentContainerStyle={styles.p5}>
                         <AvatarWithImagePicker
-                            isUploading={this.props.myPersonalDetails.avatarUploading}
+                            isUploading={this.props.currentUserPersonalDetails.avatarUploading}
                             isUsingDefaultAvatar={this.state.avatar.uri.includes('/images/avatars/avatar')}
                             avatarURL={this.state.avatar.uri}
                             onImageSelected={this.updateAvatar}
@@ -325,10 +323,8 @@ ProfilePage.displayName = 'ProfilePage';
 
 export default compose(
     withLocalize,
+    withCurrentUserPersonalDetails,
     withOnyx({
-        myPersonalDetails: {
-            key: ONYXKEYS.MY_PERSONAL_DETAILS,
-        },
         loginList: {
             key: ONYXKEYS.LOGIN_LIST,
         },
diff --git a/src/pages/settings/Profile/currentUserPersonalDetailsPropsTypes.js b/src/pages/settings/Profile/currentUserPersonalDetailsPropsTypes.js
deleted file mode 100644
index caa4d02d2e98..000000000000
--- a/src/pages/settings/Profile/currentUserPersonalDetailsPropsTypes.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import PropTypes from 'prop-types';
-
-/** The personal details of the person who is logged in */
-const currentUserPersonalDetailsPropsTypes = {
-    /** Email/Phone login of the current user from their personal details */
-    login: PropTypes.string,
-
-    /** Display first name of the current user from their personal details */
-    firstName: PropTypes.string,
-
-    /** Display last name of the current user from their personal details */
-    lastName: PropTypes.string,
-
-    /** Avatar URL of the current user from their personal details */
-    avatar: PropTypes.string,
-
-    /** Flag to set when Avatar uploading */
-    avatarUploading: PropTypes.bool,
-
-    /** Pronouns of the current user from their personal details */
-    pronouns: PropTypes.string,
-
-    /** Timezone of the current user from their personal details */
-    timezone: PropTypes.shape({
-
-        /** Value of selected timezone */
-        selected: PropTypes.string,
-
-        /** Whether timezone is automatically set */
-        automatic: PropTypes.bool,
-    }),
-};
-
-export default currentUserPersonalDetailsPropsTypes;