diff --git a/dashboard/src/components/AccessControl.vue b/dashboard/src/components/AccessControl.vue
index 8dfa3b730..6e1e472ec 100644
--- a/dashboard/src/components/AccessControl.vue
+++ b/dashboard/src/components/AccessControl.vue
@@ -1,6 +1,6 @@
 <script setup>
 
-import { ref, reactive, onMounted, watch } from 'vue';
+import { ref, onMounted } from 'vue';
 import { FormGroup, Radiobutton, MultiSelect } from 'pankow';
 import UsersModel from '../models/UsersModel.js';
 import GroupsModel from '../models/GroupsModel.js';
@@ -16,36 +16,14 @@ const groupsModel = GroupsModel.create();
 
 const props = defineProps([ 'manifest', 'error' ]);
 
-const accessRestrictionOption = ref(OPTIONS.ANY);
-const accessRestriction = reactive({ users: [], groups: [] });
+const accessRestrictionOption = defineModel('option');
+const accessRestriction = defineModel('acl');
 const users = ref([]);
 const groups = ref([]);
-const model = defineModel({ type: Object });
 
 const optionalSso = !!props.manifest.optionalSso;
 const cloudronAuth = !!(props.manifest.addons['ldap'] || props.manifest.addons['oidc'] || props.manifest.addons['proxyAuth']);
 
-function updateModelValue(option, userGroups) {
-  if (option === OPTIONS.ANY) {
-    model.value = true;
-  } else if (option === OPTIONS.NOSSO) {
-    model.value = false;
-  } else {
-    model.value = {
-      users: userGroups.users.map(u => u.id),
-      groups: userGroups.groups.map(g => g.id),
-    };
-  }
-}
-
-watch(accessRestrictionOption, (value) => {
-  updateModelValue(value, accessRestriction);
-});
-
-watch(accessRestriction, (value) => {
-  updateModelValue(accessRestrictionOption.value, value);
-});
-
 onMounted(async () => {
   let [error, result] = await usersModel.list();
   if (error) return console.error(error);
@@ -60,6 +38,8 @@ onMounted(async () => {
 
 <template>
   <div>
+
+    {{ model }}
     <FormGroup v-show="manifest.addons.email">
       <label>{{ $t('appstore.installDialog.userManagement') }}</label>
       <p>
@@ -70,20 +50,21 @@ onMounted(async () => {
 
     <FormGroup>
       <label v-show="cloudronAuth && !manifest.addons.email">{{ $t('appstore.installDialog.userManagement') }} <sup><a href="https://docs.cloudron.io/apps/#access-restriction" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+      <p v-show="cloudronAuth && !manifest.addons.email">{{ $t('app.accessControl.userManagement.description') }}</p>
       <label v-show="!cloudronAuth || manifest.addons.email">{{ $t('app.accessControl.userManagement.dashboardVisibility') }} <sup><a href="https://docs.cloudron.io/apps/#dashboard-visibility" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
       <p v-show="!cloudronAuth || manifest.addons.email">{{ $t('appstore.installDialog.userManagementNone') }}</p>
       <Radiobutton v-model="accessRestrictionOption" :value="OPTIONS.NOSSO" v-if="optionalSso" :label="$t('appstore.installDialog.userManagementLeaveToApp')"/>
       <Radiobutton v-model="accessRestrictionOption" :value="OPTIONS.ANY" :label="cloudronAuth ? $t('appstore.installDialog.userManagementAllUsers') : $t('app.accessControl.userManagement.visibleForAllUsers')"/>
-      <Radiobutton v-model="accessRestrictionOption" :value="OPTIONS.RESTRICT" :label="cloudronAuth ? $t('appstore.installDialog.userManagementSelectUsers') : $t('app.accessControl.userManagement.visibleForSelected')"/>
+      <Radiobutton v-model="accessRestrictionOption" :value="OPTIONS.RESTRICTED" :label="cloudronAuth ? $t('appstore.installDialog.userManagementSelectUsers') : $t('app.accessControl.userManagement.visibleForSelected')"/>
     </FormGroup>
 
-    <div v-if="accessRestrictionOption === OPTIONS.RESTRICT">
+    <div v-if="accessRestrictionOption === OPTIONS.RESTRICTED">
       <div style="margin-left: 20px; display: flex;">
         <div>
-          {{ $t('appstore.installDialog.users') }}: <MultiSelect v-model="accessRestriction.users" :options="users" option-label="username" />
+          {{ $t('appstore.installDialog.users') }}: <MultiSelect v-model="accessRestriction.users" :options="users" option-key="id" option-label="username" />
         </div>
         <div>
-          {{ $t('appstore.installDialog.groups') }}: <MultiSelect v-model="accessRestriction.groups" :options="groups" option-label="name" />
+          {{ $t('appstore.installDialog.groups') }}: <MultiSelect v-model="accessRestriction.groups" :options="groups" option-key="id" option-label="name" />
         </div>
       </div>
     </div>
diff --git a/dashboard/src/components/app/Email.vue b/dashboard/src/components/app/Email.vue
index 067a29807..b20858853 100644
--- a/dashboard/src/components/app/Email.vue
+++ b/dashboard/src/components/app/Email.vue
@@ -87,7 +87,7 @@ onMounted(async () => {
   domains.value = result.map(d => {
     return {
       id: d.domain,
-      label: d.domain,
+      label: `@${d.domain}`,
       domain: d.domain
     };
   });
@@ -141,12 +141,13 @@ onMounted(async () => {
               <FormGroup>
                 <div class="has-error" v-if="sendmailError">{{ sendmailError }}</div>
 
-                <InputGroup>
+                <div style="display: flex; gap: 10px;">
                   <TextInput v-if="sendmailSupportsDisplayName" v-model="sendmailDisplayName" :placeholder="$t('app.email.from.displayName')"/>
-                  <TextInput v-model="sendmailMailboxName" :placeholder="$t('app.email.from.mailboxPlaceholder')"/>
-                  <label>@</label>
-                  <SingleSelect v-model="sendmailDomain" :disabled="!enableMailbox" :options="domains" option-key="id"/>
-                </InputGroup>
+                  <InputGroup>
+                    <TextInput v-model="sendmailMailboxName" :placeholder="$t('app.email.from.mailboxPlaceholder')"/>
+                    <SingleSelect v-model="sendmailDomain" :disabled="!enableMailbox" :options="domains" option-key="id"/>
+                  </InputGroup>
+                </div>
               </FormGroup>
             </fieldset>
           </form>
diff --git a/dashboard/src/views/AppConfigureView.vue b/dashboard/src/views/AppConfigureView.vue
index 7dd3a71ad..ec29553e9 100644
--- a/dashboard/src/views/AppConfigureView.vue
+++ b/dashboard/src/views/AppConfigureView.vue
@@ -8,6 +8,7 @@ const t = i18n.t;
 
 import { ref, onMounted, onBeforeUnmount, computed } from 'vue';
 import { Button, ButtonGroup } from 'pankow';
+import Access from '../components/app/Access.vue';
 import Backups from '../components/app/Backups.vue';
 import Cron from '../components/app/Cron.vue';
 import Display from '../components/app/Display.vue';
@@ -194,7 +195,7 @@ onBeforeUnmount(() => {
           <Display :app="app" v-if="view === 'display'"/>
           <div v-if="view === 'location'"></div>
           <div v-if="view === 'proxy'"></div>
-          <div v-if="view === 'access'"></div>
+          <Access :app="app" v-if="view === 'access'"/>
           <Resources :app="app" v-if="view === 'resources'"/>
           <div v-if="view === 'services'"></div>
           <div v-if="view === 'storage'"></div>