diff --git a/dashboard/src/components/ExposedLdap.vue b/dashboard/src/components/ExposedLdap.vue
index 5de33a037..14dd4c9e8 100644
--- a/dashboard/src/components/ExposedLdap.vue
+++ b/dashboard/src/components/ExposedLdap.vue
@@ -109,7 +109,10 @@ onMounted(async () => {
       <br/>
 
       <p class="has-error" v-show="editError.generic">{{ editError.generic }}</p>
-      <Button :loading="busy" :disabled="!isValid || busy" @click="onSubmit()">{{ $t('users.settings.saveAction') }}</Button>
+
+      <div class="section-button-bar">
+        <Button :loading="busy" :disabled="!isValid || busy" @click="onSubmit()">{{ $t('users.settings.saveAction') }}</Button>
+      </div>
     </Section>
   </div>
 </template>
diff --git a/dashboard/src/components/ExternalLdap.vue b/dashboard/src/components/ExternalLdap.vue
index c17d24e73..dc818016c 100644
--- a/dashboard/src/components/ExternalLdap.vue
+++ b/dashboard/src/components/ExternalLdap.vue
@@ -381,8 +381,10 @@ onMounted(async () => {
       <p v-show="syncBusy">{{ syncMessage || 'Queued' }}</p>
       <p v-show="!syncBusy && syncError" class="has-error">{{ syncError }}</p>
 
-      <Button @click="onSync()" :loading="syncBusy" :disabled="syncBusy || config.provider === 'noop'">{{ $t('users.externalLdap.syncAction') }}</Button>
-      <Button @click="onConfigure()">{{ $t('users.externalLdap.configureAction') }}</Button>
+      <div class="section-button-bar">
+        <Button @click="onSync()" :loading="syncBusy" :disabled="syncBusy || config.provider === 'noop'">{{ $t('users.externalLdap.syncAction') }}</Button>
+        <Button @click="onConfigure()">{{ $t('users.externalLdap.configureAction') }}</Button>
+      </div>
     </Section>
   </div>
 </template>
diff --git a/dashboard/src/style.css b/dashboard/src/style.css
index 222f14456..c06258496 100644
--- a/dashboard/src/style.css
+++ b/dashboard/src/style.css
@@ -154,6 +154,12 @@ h1.section-header {
   margin-top: 20px;
 }
 
+.section-button-bar {
+  display: flex;
+  gap: 10px;
+  flex-direction: row-reverse;
+}
+
 /* info table label:value in Sections */
 .info-row {
   display: flex;
diff --git a/dashboard/src/views/UserDirectoryView.vue b/dashboard/src/views/UserDirectoryView.vue
index 063a2d240..53d8e6614 100644
--- a/dashboard/src/views/UserDirectoryView.vue
+++ b/dashboard/src/views/UserDirectoryView.vue
@@ -1,7 +1,7 @@
 <script setup>
 
-import { ref, onMounted } from 'vue';
-import { Button, Checkbox } from 'pankow';
+import { ref, onMounted, watch } from 'vue';
+import { Switch } from 'pankow';
 import Section from '../components/Section.vue';
 import ExternalLdap from '../components/ExternalLdap.vue';
 import ExposedLdap from '../components/ExposedLdap.vue';
@@ -12,16 +12,16 @@ const userDirectoryModel = UserDirectoryModel.create();
 
 const editableUserProfiles = ref(false);
 const mandatory2FA = ref(false);
-const configBusy = ref(false);
 
-async function onSubmitConfig() {
-  configBusy.value = true;
-
-  const [error] = await userDirectoryModel.setGlobalProfileConfig({ mandatory2FA: mandatory2FA.value, lockUserProfiles: !editableUserProfiles.value });
+watch(editableUserProfiles, async (newValue) => {
+  const [error] = await userDirectoryModel.setGlobalProfileConfig({ mandatory2FA: mandatory2FA.value, lockUserProfiles: !newValue });
   if (error) console.error(error);
+});
 
-  configBusy.value = false;
-}
+watch(mandatory2FA, async (newValue) => {
+  const [error] = await userDirectoryModel.setGlobalProfileConfig({ mandatory2FA: newValue, lockUserProfiles: !editableUserProfiles.value });
+  if (error) console.error(error);
+});
 
 onMounted(async () => {
   const [error, result] = await userDirectoryModel.getGlobalProfileConfig();
@@ -36,20 +36,12 @@ onMounted(async () => {
 <template>
   <div class="content">
     <Section :title="$t('users.title')">
-      <form @submit.prevent="onSubmitConfig()" autocomplete="off">
-        <fieldset :disabled="configBusy">
-          <div>
-            <Checkbox v-model="editableUserProfiles" :label="$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>
-          <div>
-            <Checkbox v-model="mandatory2FA" :label="$t('users.settings.require2FACheckbox')" />
-          </div>
-
-          <br/>
-
-          <Button @click="onSubmitConfig()" :disabled="configBusy" :loading="configBusy">{{ $t('users.settings.saveAction') }}</Button>
-        </fieldset>
-      </form>
+      <div>
+        <Switch v-model="editableUserProfiles" :label="$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>
+      <div>
+        <Switch v-model="mandatory2FA" :label="$t('users.settings.require2FACheckbox')"/>
+      </div>
     </Section>
 
     <ExternalLdap />