diff --git a/src/views/desktop/user/settings/UserDataManagementSettingTab.vue b/src/views/desktop/user/settings/UserDataManagementSettingTab.vue
index 25083755..ef1f91e1 100644
--- a/src/views/desktop/user/settings/UserDataManagementSettingTab.vue
+++ b/src/views/desktop/user/settings/UserDataManagementSettingTab.vue
@@ -126,7 +126,7 @@
                     </v-card-text>
 
                     <v-card-text class="d-flex flex-wrap gap-4">
-                        <v-btn color="error" :disabled="clearingData" @click="clearData">
+                        <v-btn color="error" :disabled="!currentPasswordForClearData || clearingData" @click="clearData">
                             {{ $t('Clear User Data') }}
                             <v-progress-circular indeterminate size="24" class="ml-2" v-if="clearingData"></v-progress-circular>
                         </v-btn>
diff --git a/src/views/desktop/user/settings/UserSecuritySettingTab.vue b/src/views/desktop/user/settings/UserSecuritySettingTab.vue
index dcf6ef0b..f5b79e65 100644
--- a/src/views/desktop/user/settings/UserSecuritySettingTab.vue
+++ b/src/views/desktop/user/settings/UserSecuritySettingTab.vue
@@ -59,7 +59,7 @@
                     </v-card-text>
 
                     <v-card-text class="d-flex flex-wrap gap-4">
-                        <v-btn :disabled="updatingPassword" @click="updatePassword">
+                        <v-btn :disabled="!currentPassword || !newPassword || !confirmPassword || updatingPassword" @click="updatePassword">
                             {{ $t('Save changes') }}
                             <v-progress-circular indeterminate size="24" class="ml-2" v-if="updatingPassword"></v-progress-circular>
                         </v-btn>
diff --git a/src/views/desktop/user/settings/UserTwoFactorAuthSettingTab.vue b/src/views/desktop/user/settings/UserTwoFactorAuthSettingTab.vue
index 509edbb4..cb9146bf 100644
--- a/src/views/desktop/user/settings/UserTwoFactorAuthSettingTab.vue
+++ b/src/views/desktop/user/settings/UserTwoFactorAuthSettingTab.vue
@@ -56,11 +56,11 @@
                 <v-card-text>
                     <v-row>
                         <v-col cols="12" class="d-flex flex-wrap gap-4">
-                            <v-btn :disabled="loading || disabling " v-if="status === true" @click="disable">
+                            <v-btn :disabled="!currentPassword || loading || disabling " v-if="status === true" @click="disable">
                                 {{ $t('Disable two-factor authentication') }}
                                 <v-progress-circular indeterminate size="24" class="ml-2" v-if="disabling"></v-progress-circular>
                             </v-btn>
-                            <v-btn :disabled="loading || regenerating" v-if="status === true" @click="regenerateBackupCode()">
+                            <v-btn :disabled="!currentPassword || loading || regenerating" v-if="status === true" @click="regenerateBackupCode()">
                                 {{ $t('Regenerate Backup Codes') }}
                                 <v-progress-circular indeterminate size="24" class="ml-2" v-if="regenerating"></v-progress-circular>
                             </v-btn>
@@ -68,7 +68,7 @@
                                 {{ $t('Enable two-factor authentication') }}
                                 <v-progress-circular indeterminate size="24" class="ml-2" v-if="enabling"></v-progress-circular>
                             </v-btn>
-                            <v-btn :disabled="loading || enableConfirming" v-if="status === false && new2FAQRCode" @click="enableConfirm">
+                            <v-btn :disabled="!currentPasscode || loading || enableConfirming" v-if="status === false && new2FAQRCode" @click="enableConfirm">
                                 {{ $t('Continue') }}
                                 <v-progress-circular indeterminate size="24" class="ml-2" v-if="enableConfirming"></v-progress-circular>
                             </v-btn>