diff --git a/packages/frontend/src/components/accounts/create/ActivateAccount.js b/packages/frontend/src/components/accounts/create/ActivateAccount.js
index 853834f7e9..7639921e0a 100644
--- a/packages/frontend/src/components/accounts/create/ActivateAccount.js
+++ b/packages/frontend/src/components/accounts/create/ActivateAccount.js
@@ -7,7 +7,8 @@ import styled from 'styled-components';
 
 import { Mixpanel } from '../../../mixpanel';
 import { redirectTo, clearFundedAccountNeedsDeposit, getBalance, getAccountHelperWalletState } from '../../../redux/actions/account';
-import { selectAccountSlice } from '../../../redux/slices/account';
+import { selectAccountFundedAccountNeedsDeposit, selectAccountRequiredUnlockBalance, selectAccountSlice } from '../../../redux/slices/account';
+import { selectStatusMainLoader } from '../../../redux/slices/status';
 import { selectNearTokenFiatValueUSD } from '../../../redux/slices/tokenFiatValues';
 import { removeAccountIsInactive } from '../../../utils/localStorage';
 import { isMoonpayAvailable, getSignedUrl } from '../../../utils/moonpay';
@@ -251,15 +252,12 @@ class ActivateAccount extends Component {
     }
 }
 
-const mapStateToProps = (state) => {
-    const { account, status } = state;
-    return {
-        ...selectAccountSlice(state),
-        mainLoader: status.mainLoader,
-        minBalanceToUnlock: account.accountHelperWalletState?.requiredUnlockBalance || MIN_BALANCE_FOR_GAS,
-        needsDeposit: account.accountHelperWalletState?.fundedAccountNeedsDeposit,
-        nearTokenFiatValueUSD: selectNearTokenFiatValueUSD(state)
-    };
-};
+const mapStateToProps = (state) => ({
+    ...selectAccountSlice(state),
+    mainLoader: selectStatusMainLoader(state),
+    minBalanceToUnlock: selectAccountRequiredUnlockBalance(state) || MIN_BALANCE_FOR_GAS,
+    needsDeposit: selectAccountFundedAccountNeedsDeposit(state),
+    nearTokenFiatValueUSD: selectNearTokenFiatValueUSD(state)
+});
 
 export const ActivateAccountWithRouter = connect(mapStateToProps)(withRouter(ActivateAccount));