diff --git a/dashboard/src/views/UserDirectorySettingsView.vue b/dashboard/src/views/UserDirectorySettingsView.vue
index 29c1d0061..b770275a6 100644
--- a/dashboard/src/views/UserDirectorySettingsView.vue
+++ b/dashboard/src/views/UserDirectorySettingsView.vue
@@ -1,7 +1,8 @@
 <script setup>
 
-import { ref, onMounted, inject } from 'vue';
+import { ref, onMounted, inject, useTemplateRef } from 'vue';
 import { Switch } from '@cloudron/pankow';
+import SaveIndicator from '../components/SaveIndicator.vue';
 import Section from '../components/Section.vue';
 import SettingsItem from '../components/SettingsItem.vue';
 import UserDirectoryModel from '../models/UserDirectoryModel.js';
@@ -11,8 +12,8 @@ const features = inject('features');
 const userDirectoryModel = UserDirectoryModel.create();
 
 const busy = ref(false);
-const editableUserProfiles = ref(false);
 const mandatory2FA = ref(false);
+const mandatory2FASaveIndicator = useTemplateRef('mandatory2FASaveIndicator');
 
 async function onToggleMandatory2FA(value) {
   busy.value = true;
@@ -20,19 +21,28 @@ async function onToggleMandatory2FA(value) {
   const [error] = await userDirectoryModel.setGlobalProfileConfig({ mandatory2FA: value, lockUserProfiles: !editableUserProfiles.value });
   if (error) {
     mandatory2FA.value = !value;
+    mandatory2FASaveIndicator.value.error();
     console.error(error);
+  } else {
+    mandatory2FASaveIndicator.value.success();
   }
 
   busy.value = false;
 }
 
+const editableUserProfiles = ref(false);
+const editableUserProfilesSaveIndicator = useTemplateRef('editableUserProfilesSaveIndicator');
+
 async function onToggleEditableUserProfiles(value) {
   busy.value = true;
 
   const [error] = await userDirectoryModel.setGlobalProfileConfig({ mandatory2FA: mandatory2FA.value, lockUserProfiles: !value });
   if (error) {
     editableUserProfiles.value = !value;
+    editableUserProfilesSaveIndicator.value.error();
     console.error(error);
+  } else {
+    editableUserProfilesSaveIndicator.value.success();
   }
 
   busy.value = false;
@@ -54,11 +64,13 @@ onMounted(async () => {
       <SettingsItem>
         <div>{{ $t('users.settings.allowProfileEditCheckbox') }} <sup><a href="https://docs.cloudron.io/user-directory/#lock-profile" target="_blank"><i class="fa fa-question-circle"></i></a></sup></div>
         <Switch v-model="editableUserProfiles" @change="onToggleEditableUserProfiles" :disabled="busy || !features.profileConfig"/>
+        <SaveIndicator ref="editableUserProfilesSaveIndicator"/>
       </SettingsItem>
 
       <SettingsItem>
         <div>{{ $t('users.settings.require2FACheckbox') }}</div>
         <Switch v-model="mandatory2FA" @change="onToggleMandatory2FA" :disabled="busy || !features.profileConfig"/>
+        <SaveIndicator ref="mandatory2FASaveIndicator"/>
       </SettingsItem>
     </Section>
   </div>