diff --git a/src/views/setting/components/SecuritySection.vue b/src/views/setting/components/SecuritySection.vue
index 91cb92a..d7e6842 100644
--- a/src/views/setting/components/SecuritySection.vue
+++ b/src/views/setting/components/SecuritySection.vue
@@ -28,7 +28,7 @@
 			</div>
 		</div>
 
-		<div v-show="isEditing && isEditingEmail" class="security-row">
+		<div v-if="isEditing && isEditingEmail" class="security-row">
 			<div class="security-label">{{ t('Settings.security.newEmail') }}</div>
 			<div class="outlined-field verify-field">
 				<el-input
@@ -75,7 +75,7 @@
 			</div>
 		</div>
 
-		<div v-show="isEditing && isEditingPassword" class="security-row">
+		<div v-if="isEditing && isEditingPassword" class="security-row">
 			<div class="security-label">{{ t('Settings.security.newPassword') }}</div>
 			<div class="outlined-field">
 				<PasswordTip :value="newPassword" v-show="showNewPWDTip" />
@@ -92,7 +92,7 @@
 			<div class="security-tip">{{ t('Settings.security.passwordTip') }}</div>
 		</div>
 
-		<div v-show="isEditing && isEditingPassword" class="security-row">
+		<div v-if="isEditing && isEditingPassword" class="security-row">
 			<div class="security-label">{{ t('Settings.security.currentPassword') }}</div>
 			<div class="outlined-field">
 				<PasswordTip :value="newPassword" v-show="showOldPWDTip" />
diff --git a/src/views/setting/useSettingsForm.ts b/src/views/setting/useSettingsForm.ts
index 8ebe9ae..bce3665 100644
--- a/src/views/setting/useSettingsForm.ts
+++ b/src/views/setting/useSettingsForm.ts
@@ -123,9 +123,12 @@ export function useSettingsForm({ t, locale }: UseSettingsFormOptions) {
 		() => hasNewEmailChange.value && verifiedEmail.value === normalizedNewEmail.value
 	)
 	const hasNewPasswordChange = computed(() => securityDraft.value.newPassword.length > 0)
-	const needsEmailVerification = computed(
-		() => (hasNewEmailChange.value || hasNewPasswordChange.value) && !isEmailVerified.value
-	)
+	const needsEmailVerification = computed(() => {
+		if (!hasNewEmailChange.value && !hasNewPasswordChange.value) return false
+		if (hasNewEmailChange.value && !isEmailVerified.value) return true
+		if (hasNewPasswordChange.value && !verificationCode.value) return true
+		return false
+	})
 	const displayLanguageLabel = computed(() =>
 		displayData.value.language ? t(`Settings.languages.${displayData.value.language}`) : ''
 	)