diff --git a/src/app/auth/create/step-1.tsx b/src/app/auth/create/step-1.tsx
index 8341f324..e3533890 100644
--- a/src/app/auth/create/step-1.tsx
+++ b/src/app/auth/create/step-1.tsx
@@ -9,15 +9,14 @@ import { Button } from '@shared/button';
 import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
 
 import { useOnboarding } from '@stores/onboarding';
+import { useStronghold } from '@stores/stronghold';
 
 export function CreateStep1Screen() {
-  const navigate = useNavigate();
   const queryClient = useQueryClient();
+  const navigate = useNavigate();
+  const setPrivkey = useStronghold((state) => state.setPrivkey);
+  const setPubkey = useOnboarding((state) => state.setPubkey);
 
-  const [setPubkey, setPrivkey] = useOnboarding((state) => [
-    state.setPubkey,
-    state.setPrivkey,
-  ]);
   const [privkeyInput, setPrivkeyInput] = useState('password');
   const [loading, setLoading] = useState(false);
 
diff --git a/src/app/auth/create/step-2.tsx b/src/app/auth/create/step-2.tsx
index 7ecf2fb4..19388650 100644
--- a/src/app/auth/create/step-2.tsx
+++ b/src/app/auth/create/step-2.tsx
@@ -29,11 +29,15 @@ const resolver: Resolver<FormValues> = async (values) => {
 
 export function CreateStep2Screen() {
   const navigate = useNavigate();
-  const setPassword = useStronghold((state) => state.setPassword);
 
-  const [pubkey, privkey] = useOnboarding((state) => [state.pubkey, state.privkey]);
   const [passwordInput, setPasswordInput] = useState('password');
   const [loading, setLoading] = useState(false);
+  const [privkey, setPassword] = useStronghold((state) => [
+    state.privkey,
+    state.setPassword,
+  ]);
+
+  const pubkey = useOnboarding((state) => state.privkey);
 
   const { save } = useSecureStorage();
 
diff --git a/src/app/auth/create/step-5.tsx b/src/app/auth/create/step-5.tsx
index f9132426..fd86eeff 100644
--- a/src/app/auth/create/step-5.tsx
+++ b/src/app/auth/create/step-5.tsx
@@ -163,7 +163,7 @@ export function CreateStep5Screen() {
     }
   };
 
-  const list = data ? data.profiles.concat(INITIAL_LIST) : [];
+  const list = data ? data.profiles.concat(INITIAL_LIST) : INITIAL_LIST;
 
   return (
     <div className="mx-auto w-full max-w-md">
diff --git a/src/app/auth/import/step-1.tsx b/src/app/auth/import/step-1.tsx
index 0c73349d..3b4e6e63 100644
--- a/src/app/auth/import/step-1.tsx
+++ b/src/app/auth/import/step-1.tsx
@@ -9,6 +9,7 @@ import { createAccount } from '@libs/storage';
 import { LoaderIcon } from '@shared/icons';
 
 import { useOnboarding } from '@stores/onboarding';
+import { useStronghold } from '@stores/stronghold';
 
 type FormValues = {
   privkey: string;
@@ -31,11 +32,9 @@ const resolver: Resolver<FormValues> = async (values) => {
 export function ImportStep1Screen() {
   const queryClient = useQueryClient();
   const navigate = useNavigate();
+  const setPrivkey = useStronghold((state) => state.setPrivkey);
+  const setPubkey = useOnboarding((state) => state.setPubkey);
 
-  const [setPubkey, setPrivkey] = useOnboarding((state) => [
-    state.setPubkey,
-    state.setPrivkey,
-  ]);
   const [loading, setLoading] = useState(false);
 
   const account = useMutation({
@@ -74,6 +73,7 @@ export function ImportStep1Screen() {
 
         // use for onboarding process only
         setPubkey(pubkey);
+        // add stronghold state
         setPrivkey(privkey);
 
         // add account to local database
diff --git a/src/app/auth/import/step-2.tsx b/src/app/auth/import/step-2.tsx
index 6a65cc0d..3d5cd54c 100644
--- a/src/app/auth/import/step-2.tsx
+++ b/src/app/auth/import/step-2.tsx
@@ -29,11 +29,15 @@ const resolver: Resolver<FormValues> = async (values) => {
 
 export function ImportStep2Screen() {
   const navigate = useNavigate();
-  const setPassword = useStronghold((state) => state.setPassword);
 
   const [passwordInput, setPasswordInput] = useState('password');
   const [loading, setLoading] = useState(false);
-  const [pubkey, privkey] = useOnboarding((state) => [state.pubkey, state.privkey]);
+  const [privkey, setPassword] = useStronghold((state) => [
+    state.privkey,
+    state.setPassword,
+  ]);
+
+  const pubkey = useOnboarding((state) => state.pubkey);
 
   const { save } = useSecureStorage();
 
diff --git a/src/app/auth/migrate.tsx b/src/app/auth/migrate.tsx
index ce8f857b..ed174eee 100644
--- a/src/app/auth/migrate.tsx
+++ b/src/app/auth/migrate.tsx
@@ -5,7 +5,7 @@ import { useNavigate } from 'react-router-dom';
 
 import { removePrivkey } from '@libs/storage';
 
-import { CheckCircleIcon, EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
+import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
 
 import { useStronghold } from '@stores/stronghold';
 
@@ -35,14 +35,15 @@ export function MigrateScreen() {
   const navigate = useNavigate();
 
   const [passwordInput, setPasswordInput] = useState('password');
-  const [passwordStep, setPasswordStep] = useState({ loading: false, done: false });
-  const [privkeyStep, setPrivkeyStep] = useState({ loading: false, done: false });
+  const [loading, setLoading] = useState(false);
+  const [setPassword, setPrivkey] = useStronghold((state) => [
+    state.setPassword,
+    state.setPrivkey,
+  ]);
 
   const { account } = useAccount();
   const { save } = useSecureStorage();
 
-  const setPassword = useStronghold((state) => state.setPassword);
-
   // toggle private key
   const showPassword = () => {
     if (passwordInput === 'password') {
@@ -52,16 +53,6 @@ export function MigrateScreen() {
     }
   };
 
-  const clearPrivkey = async () => {
-    setPrivkeyStep((prev) => ({ ...prev, loading: true }));
-    const res = await removePrivkey();
-    if (res) {
-      setPrivkeyStep({ done: true, loading: false });
-    } else {
-      setPrivkeyStep((prev) => ({ ...prev, loading: false }));
-    }
-  };
-
   const {
     register,
     setError,
@@ -70,27 +61,32 @@ export function MigrateScreen() {
   } = useForm<FormValues>({ resolver });
 
   const onSubmit = async (data: { [x: string]: string }) => {
-    setPasswordStep((prev) => ({ ...prev, loading: true }));
+    setLoading(true);
     if (data.password.length > 3) {
       // add password to local state
       setPassword(data.password);
 
       // load private in secure storage
       try {
+        // save privkey to secure storage
         await save(account.pubkey, account.privkey, data.password);
+        // add privkey to state
+        setPrivkey(account.privkey);
+        // remove privkey in db
+        await removePrivkey();
         // clear cache
         await queryClient.invalidateQueries(['currentAccount']);
         // redirect to home
         navigate('/', { replace: true });
       } catch {
-        setPasswordStep((prev) => ({ ...prev, loading: false }));
+        setLoading(false);
         setError('password', {
           type: 'custom',
           message: 'Wrong password',
         });
       }
     } else {
-      setPasswordStep((prev) => ({ ...prev, loading: false }));
+      setLoading(false);
       setError('password', {
         type: 'custom',
         message: 'Password is required and must be greater than 3',
@@ -109,53 +105,25 @@ export function MigrateScreen() {
         <div className="w-full rounded-xl border-t border-zinc-800/50 bg-zinc-900 px-3 py-3">
           <div className="flex flex-col gap-4">
             <div>
-              <h3 className="font-medium text-zinc-200">
-                Remove plaintext privkey store in local database
-              </h3>
               <div className="mt-1">
                 <p className="text-sm text-zinc-400">
                   You&apos;re using old Lume version which store your private key as
                   plaintext in database, this is huge security risk.
                 </p>
-                <p className="mt-2 text-sm text-zinc-400">To secure your private key</p>
-                <ul className="mt-2 list-outside list-disc pl-5 text-sm text-zinc-400">
-                  <li>Firstly, click button below to remove it from local database</li>
-                  <li>
-                    Then set password and Lume will put your private key in secure storage
-                  </li>
-                </ul>
-              </div>
-              <div className="mt-3">
-                <div className="relative">
-                  <input
-                    readOnly
-                    value={privkeyStep.done ? 'Nothing to see here' : account.privkey}
-                    className="relative w-full rounded-lg bg-zinc-800 px-3 py-3 text-zinc-100 !outline-none placeholder:text-zinc-500"
-                  />
-                  <div className="absolute left-0 top-0 flex h-full w-full items-center justify-center rounded-lg bg-black/10 backdrop-blur-sm">
-                    {privkeyStep.done ? (
-                      privkeyStep.loading ? (
-                        <LoaderIcon className="h-4 w-4 animate-spin text-zinc-100" />
-                      ) : (
-                        <CheckCircleIcon className="h-5 w-5 text-green-500" />
-                      )
-                    ) : (
-                      <button
-                        type="button"
-                        onClick={() => clearPrivkey()}
-                        className="inline-flex w-max items-center justify-center rounded bg-fuchsia-500 px-2.5 py-1.5 text-sm hover:bg-fuchsia-600"
-                      >
-                        Click to remove
-                      </button>
-                    )}
-                  </div>
-                </div>
+                <p className="mt-2 text-sm text-zinc-400">
+                  To secure your private key, please set a password and Lume will put your
+                  private key in secure storage.
+                </p>
+                <p className="mt-2 text-sm text-zinc-400">
+                  It is not possible to start the app without applying this step, it is
+                  easy and fast!
+                </p>
               </div>
             </div>
             <form onSubmit={handleSubmit(onSubmit)} className="mb-0">
               <div className="flex flex-col gap-1">
                 <span className="font-medium text-zinc-200">
-                  Set password to protect your key
+                  Set a password to protect your key
                 </span>
                 <div className="relative">
                   <input
@@ -189,19 +157,17 @@ export function MigrateScreen() {
                 </span>
               </div>
               <div className="flex items-center justify-center">
-                {privkeyStep.done && (
-                  <button
-                    type="submit"
-                    disabled={!isDirty || !isValid}
-                    className="mt-3 inline-flex h-11 w-full items-center justify-center rounded-md bg-fuchsia-500 font-medium text-zinc-100 hover:bg-fuchsia-600 disabled:pointer-events-none disabled:opacity-50"
-                  >
-                    {passwordStep.loading ? (
-                      <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
-                    ) : (
-                      'Continue →'
-                    )}
-                  </button>
-                )}
+                <button
+                  type="submit"
+                  disabled={!isDirty || !isValid}
+                  className="mt-3 inline-flex h-11 w-full items-center justify-center rounded-md bg-fuchsia-500 font-medium text-zinc-100 hover:bg-fuchsia-600 disabled:pointer-events-none disabled:opacity-50"
+                >
+                  {loading ? (
+                    <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
+                  ) : (
+                    'Continue →'
+                  )}
+                </button>
               </div>
             </form>
           </div>