diff --git a/nym-wallet/src/pages/auth/pages/connect-password.tsx b/nym-wallet/src/pages/auth/pages/connect-password.tsx
index 971326ffc6..133d0a27cb 100644
--- a/nym-wallet/src/pages/auth/pages/connect-password.tsx
+++ b/nym-wallet/src/pages/auth/pages/connect-password.tsx
@@ -3,8 +3,8 @@ import { useNavigate } from 'react-router-dom';
 import { Button, CircularProgress, FormControl, Stack } from '@mui/material';
 import { useSnackbar } from 'notistack';
 import { AuthContext } from 'src/context/auth';
-import { createPassword } from 'src/requests';
 import { PasswordInput } from 'src/components';
+import { archiveWalletFile, createPassword, isPasswordCreated } from 'src/requests';
 import { Subtitle, Title, PasswordStrength } from '../components';
 
 export const ConnectPassword = () => {
@@ -20,6 +20,12 @@ export const ConnectPassword = () => {
   const storePassword = async () => {
     try {
       setIsLoading(true);
+
+      const exists = await isPasswordCreated();
+      if (exists) {
+        await archiveWalletFile();
+      }
+
       await createPassword({ mnemonic, password });
       resetState();
       enqueueSnackbar('Password successfully created', { variant: 'success' });
diff --git a/nym-wallet/src/pages/auth/pages/forgot-password.tsx b/nym-wallet/src/pages/auth/pages/forgot-password.tsx
index d0f614856a..0bf535d391 100644
--- a/nym-wallet/src/pages/auth/pages/forgot-password.tsx
+++ b/nym-wallet/src/pages/auth/pages/forgot-password.tsx
@@ -2,32 +2,15 @@
 import React from 'react';
 import { useNavigate } from 'react-router-dom';
 import { Button, Stack, Typography } from '@mui/material';
-import { useSnackbar } from 'notistack';
-import { archiveWalletFile } from 'src/requests';
-import { Console } from 'src/utils/console';
 import { Subtitle } from '../components';
 
 export const ForgotPassword = () => {
   const navigate = useNavigate();
-  const { enqueueSnackbar } = useSnackbar();
   return (
     <>
       <Subtitle subtitle="Create a new password or sign in with mnemonic" />
       <Stack spacing={2} sx={{ width: 300 }}>
-        <Button
-          variant="contained"
-          size="large"
-          onClick={async () => {
-            try {
-              await archiveWalletFile();
-            } catch (e) {
-              Console.error(e);
-              enqueueSnackbar('Failed to archive your existing wallet file', { variant: 'error' });
-            }
-            navigate('/confirm-mnemonic');
-          }}
-          fullWidth
-        >
+        <Button variant="contained" size="large" onClick={() => navigate('/confirm-mnemonic')} fullWidth>
           Create a new password
         </Button>
         <Typography sx={{ textAlign: 'center', fontWeight: 600 }}>or</Typography>