diff --git a/src/shared/utils/common.js b/src/shared/utils/common.js
index 6949fb90..8bfb847b 100644
--- a/src/shared/utils/common.js
+++ b/src/shared/utils/common.js
@@ -391,30 +391,23 @@ function openExternalLink(link) {
         distinguishCancelAndClose: true,
         confirmButtonText: 'Open',
         cancelButtonText: 'Copy',
-        type: 'info'
+        type: 'info',
+        beforeClose: (action, instance, done) => {
+            if (action === 'cancel') {
+                copyToClipboard(link);
+            }
+            done();
+        }
     })
         .then((action) => {
+            console.log(action);
             if (action === 'confirm') {
                 AppApi.OpenLink(link);
-            } else if (action === 'cancel') {
-                copyLink(link);
             }
         })
         .catch(() => {});
 }
 
-/**
- *
- * @param {string} text
- */
-function copyLink(text) {
-    ElMessage({
-        message: 'Link copied to clipboard',
-        type: 'success'
-    });
-    copyToClipboard(text);
-}
-
 /**
  *
  * @param {object} ref
@@ -541,7 +534,6 @@ export {
     buildTreeData,
     replaceBioSymbols,
     openExternalLink,
-    copyLink,
     getBundleDateSize,
     openFolderGeneric,
     debounce
diff --git a/src/stores/auth.js b/src/stores/auth.js
index 70769fa7..5f4214fb 100644
--- a/src/stores/auth.js
+++ b/src/stores/auth.js
@@ -662,6 +662,9 @@ export const useAuthStore = defineStore('Auth', () => {
                 inputErrorMessage: t('prompt.totp.input_error'),
                 beforeClose: (action, instance, done) => {
                     state.twoFactorAuthDialogVisible = false;
+                    if (action === 'cancel') {
+                        promptOTP();
+                    }
                     done();
                 }
             }
@@ -672,15 +675,12 @@ export const useAuthStore = defineStore('Auth', () => {
                         code: value.trim()
                     })
                     .catch((err) => {
+                        console.error(err);
                         clearCookiesTryLogin();
-                        throw err;
                     })
-                    .then((args) => {
+                    .then(() => {
                         userStore.getCurrentUser();
-                        return args;
                     });
-            } else if (action === 'cancel') {
-                promptOTP();
             }
         });
     }
@@ -702,6 +702,9 @@ export const useAuthStore = defineStore('Auth', () => {
                 inputErrorMessage: t('prompt.otp.input_error'),
                 beforeClose: (action, instance, done) => {
                     state.twoFactorAuthDialogVisible = false;
+                    if (action === 'cancel') {
+                        promptTOTP();
+                    }
                     done();
                 }
             }
@@ -712,15 +715,12 @@ export const useAuthStore = defineStore('Auth', () => {
                         code: value.trim()
                     })
                     .catch((err) => {
+                        console.error(err);
                         clearCookiesTryLogin();
-                        throw err;
                     })
-                    .then((args) => {
+                    .then(() => {
                         userStore.getCurrentUser();
-                        return args;
                     });
-            } else if (action === 'cancel') {
-                promptTOTP();
             }
         });
     }
@@ -743,6 +743,10 @@ export const useAuthStore = defineStore('Auth', () => {
                 inputErrorMessage: t('prompt.email_otp.input_error'),
                 beforeClose: (action, instance, done) => {
                     state.twoFactorAuthDialogVisible = false;
+                    if (action === 'cancel') {
+                        resendEmail2fa();
+                        return;
+                    }
                     done();
                 }
             }
@@ -753,15 +757,12 @@ export const useAuthStore = defineStore('Auth', () => {
                         code: value.trim()
                     })
                     .catch((err) => {
+                        console.error(err);
                         promptEmailOTP();
-                        throw err;
                     })
-                    .then((args) => {
+                    .then(() => {
                         userStore.getCurrentUser();
-                        return args;
                     });
-            } else if (action === 'cancel') {
-                resendEmail2fa();
             }
         });
     }