diff --git a/dashboard/src/components/AccessControl.vue b/dashboard/src/components/AccessControl.vue
index ea4f18df9..eb919d465 100644
--- a/dashboard/src/components/AccessControl.vue
+++ b/dashboard/src/components/AccessControl.vue
@@ -5,16 +5,14 @@ import { FormGroup, Radiobutton, MultiSelect } from 'pankow';
 import UsersModel from '../models/UsersModel.js';
 import GroupsModel from '../models/GroupsModel.js';
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 const OPTIONS = Object.freeze({
   ANY: 'any',
   RESTRICTED: 'restricted',
   NOSSO: 'nosso',
 });
 
-const usersModel = UsersModel.create(API_ORIGIN, localStorage.token);
-const groupsModel = GroupsModel.create(API_ORIGIN, localStorage.token);
+const usersModel = UsersModel.create();
+const groupsModel = GroupsModel.create();
 
 const props = defineProps([ 'manifest', 'error' ]);
 
diff --git a/dashboard/src/components/ApiTokens.vue b/dashboard/src/components/ApiTokens.vue
index 7db492039..6a5e018e3 100644
--- a/dashboard/src/components/ApiTokens.vue
+++ b/dashboard/src/components/ApiTokens.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { useI18n } from 'vue-i18n';
 const i18n = useI18n();
 const t = i18n.t;
@@ -14,7 +12,7 @@ import { TOKEN_TYPES } from '../constants.js';
 import Section from './Section.vue';
 import TokensModel from '../models/TokensModel.js';
 
-const tokensModel = TokensModel.create(API_ORIGIN, localStorage.token);
+const tokensModel = TokensModel.create();
 
 const apiTokens = ref([]);
 const inputDialog = useTemplateRef('inputDialog');
diff --git a/dashboard/src/components/AppInstallDialog.vue b/dashboard/src/components/AppInstallDialog.vue
index 1e73a6cb1..2a448fbb1 100644
--- a/dashboard/src/components/AppInstallDialog.vue
+++ b/dashboard/src/components/AppInstallDialog.vue
@@ -11,16 +11,14 @@ import AppsModel from '../models/AppsModel.js';
 import DashboardModel from '../models/DashboardModel.js';
 import { PROXY_APP_ID } from '../constants.js';
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 const STEP = Object.freeze({
   DETAILS: Symbol('details'),
   INSTALL: Symbol('install'),
 });
 
-const domainsModel = DomainsModel.create(API_ORIGIN, localStorage.token);
-const appsModel = AppsModel.create(API_ORIGIN, localStorage.token);
-const dashboardModel = DashboardModel.create(API_ORIGIN, localStorage.token);
+const domainsModel = DomainsModel.create();
+const appsModel = AppsModel.create();
+const dashboardModel = DashboardModel.create();
 
 // reactive
 const busy = ref(false);
diff --git a/dashboard/src/components/AppPasswords.vue b/dashboard/src/components/AppPasswords.vue
index 6ceb503bc..bc215ffce 100644
--- a/dashboard/src/components/AppPasswords.vue
+++ b/dashboard/src/components/AppPasswords.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { useI18n } from 'vue-i18n';
 const i18n = useI18n();
 const t = i18n.t;
@@ -14,8 +12,8 @@ import Section from './Section.vue';
 import AppPasswordsModel from '../models/AppPasswordsModel.js';
 import AppsModel from '../models/AppsModel.js';
 
-const appPasswordsModel = AppPasswordsModel.create(API_ORIGIN, localStorage.token);
-const appsModel = AppsModel.create(API_ORIGIN, localStorage.token);
+const appPasswordsModel = AppPasswordsModel.create();
+const appsModel = AppsModel.create();
 
 const newDialog = useTemplateRef('newDialog');
 const inputDialog = useTemplateRef('inputDialog');
diff --git a/dashboard/src/components/ApplinkDialog.vue b/dashboard/src/components/ApplinkDialog.vue
index ba630e4d2..eb441bbaa 100644
--- a/dashboard/src/components/ApplinkDialog.vue
+++ b/dashboard/src/components/ApplinkDialog.vue
@@ -1,17 +1,16 @@
 <script>
 
+const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
+
 import { Dialog, FormGroup, InputDialog, MultiSelect, Radiobutton, TagInput, TextInput } from 'pankow';
 
 import ApplinksModel from '../models/ApplinksModel.js';
 import UsersModel from '../models/UsersModel.js';
 import GroupsModel from '../models/GroupsModel.js';
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-const accessToken = localStorage.token;
-
-const applinksModel = ApplinksModel.create(API_ORIGIN, accessToken);
-const usersModel = UsersModel.create(API_ORIGIN, accessToken);
-const groupsModel = GroupsModel.create(API_ORIGIN, accessToken);
+const applinksModel = ApplinksModel.create();
+const usersModel = UsersModel.create();
+const groupsModel = GroupsModel.create();
 
 export default {
   name: 'ApplinkDialog',
diff --git a/dashboard/src/components/Certificates.vue b/dashboard/src/components/Certificates.vue
index 226f827e7..e6ad04a48 100644
--- a/dashboard/src/components/Certificates.vue
+++ b/dashboard/src/components/Certificates.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { ref, onMounted } from 'vue';
 import { Button, ProgressBar } from 'pankow';
 import { prettyLongDate } from 'pankow/utils';
@@ -10,8 +8,8 @@ import Section from '../components/Section.vue';
 import TasksModel from '../models/TasksModel.js';
 import DomainsModel from '../models/DomainsModel.js';
 
-const taskModel = TasksModel.create(API_ORIGIN, localStorage.token);
-const domainsModel = DomainsModel.create(API_ORIGIN, localStorage.token);
+const taskModel = TasksModel.create();
+const domainsModel = DomainsModel.create();
 
 const lastTask = ref({});
 const taskLogsMenu = ref([]);
diff --git a/dashboard/src/components/CloudronAccount.vue b/dashboard/src/components/CloudronAccount.vue
index f272bcb9e..a69ca527f 100644
--- a/dashboard/src/components/CloudronAccount.vue
+++ b/dashboard/src/components/CloudronAccount.vue
@@ -1,14 +1,12 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { ref, onMounted } from 'vue';
 import { Button } from 'pankow';
 import { prettyDate } from 'pankow/utils';
 import Section from '../components/Section.vue';
 import AppstoreModel from '../models/AppstoreModel.js';
 
-const appstoreModel = AppstoreModel.create(API_ORIGIN, localStorage.token);
+const appstoreModel = AppstoreModel.create();
 
 // TODO maybe support dev.console.cloudron.io
 const consoleServerOrigin = 'https://console.cloudron.io';
diff --git a/dashboard/src/components/DashboardDomain.vue b/dashboard/src/components/DashboardDomain.vue
index 820ead679..0187fa145 100644
--- a/dashboard/src/components/DashboardDomain.vue
+++ b/dashboard/src/components/DashboardDomain.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { ref, onMounted } from 'vue';
 import { Button, ProgressBar, Dropdown } from 'pankow';
 import { prettyLongDate } from 'pankow/utils';
@@ -11,9 +9,9 @@ import TasksModel from '../models/TasksModel.js';
 import DomainsModel from '../models/DomainsModel.js';
 import DashboardModel from '../models/DashboardModel.js';
 
-const taskModel = TasksModel.create(API_ORIGIN, localStorage.token);
-const domainsModel = DomainsModel.create(API_ORIGIN, localStorage.token);
-const dashboardModel = DashboardModel.create(API_ORIGIN, localStorage.token);
+const taskModel = TasksModel.create();
+const domainsModel = DomainsModel.create();
+const dashboardModel = DashboardModel.create();
 
 const domains = ref([]);
 const newDomain = ref('');
diff --git a/dashboard/src/components/DomainDialog.vue b/dashboard/src/components/DomainDialog.vue
index a435e4674..60867c4a1 100644
--- a/dashboard/src/components/DomainDialog.vue
+++ b/dashboard/src/components/DomainDialog.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { ref, useTemplateRef } from 'vue';
 import { Dialog, TextInput, FormGroup, Checkbox } from 'pankow';
 import { ENDPOINTS_OVH } from '../constants.js';
@@ -9,7 +7,7 @@ import DomainsModel from '../models/DomainsModel.js';
 
 const emit = defineEmits([ 'success' ]);
 
-const domainsModel = DomainsModel.create(API_ORIGIN, localStorage.token);
+const domainsModel = DomainsModel.create();
 
  // currently, validation of wildcard with various provider is done server side
  const tlsProviders = [
diff --git a/dashboard/src/components/ExposedLdap.vue b/dashboard/src/components/ExposedLdap.vue
index 7e82f969d..dc0d34251 100644
--- a/dashboard/src/components/ExposedLdap.vue
+++ b/dashboard/src/components/ExposedLdap.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { ref, onMounted, computed } from 'vue';
 import { Button, FormGroup, Checkbox, PasswordInput, TextInput } from 'pankow';
 import { copyToClipboard } from 'pankow/utils';
@@ -10,9 +8,9 @@ import DomainsModel from '../models/DomainsModel.js';
 import DashboardModel from '../models/DashboardModel.js';
 import UserDirectoryModel from '../models/UserDirectoryModel.js';
 
-const domainsModel = DomainsModel.create(API_ORIGIN, localStorage.token);
-const dashboardModel = DashboardModel.create(API_ORIGIN, localStorage.token);
-const userDirectoryModel = UserDirectoryModel.create(API_ORIGIN, localStorage.token);
+const domainsModel = DomainsModel.create();
+const dashboardModel = DashboardModel.create();
+const userDirectoryModel = UserDirectoryModel.create();
 
 const adminDomain = ref({});
 
diff --git a/dashboard/src/components/ExternalLdap.vue b/dashboard/src/components/ExternalLdap.vue
index 76797c7d3..2d3f55a5f 100644
--- a/dashboard/src/components/ExternalLdap.vue
+++ b/dashboard/src/components/ExternalLdap.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { ref, useTemplateRef, onMounted, computed } from 'vue';
 import { Dialog, Button, Icon, FormGroup, Dropdown, Checkbox, TextInput, ProgressBar } from 'pankow';
 import { prettyLongDate } from 'pankow/utils';
@@ -10,8 +8,8 @@ import UserDirectoryModel from '../models/UserDirectoryModel.js';
 import TasksModel from '../models/TasksModel.js';
 import { TASK_TYPES } from '../constants.js';
 
-const userDirectoryModel = UserDirectoryModel.create(API_ORIGIN, localStorage.token);
-const tasksModel = TasksModel.create(API_ORIGIN, localStorage.token);
+const userDirectoryModel = UserDirectoryModel.create();
+const tasksModel = TasksModel.create();
 
 const availableProviders = [
   { name: 'Active Directory', value: 'ad' },
diff --git a/dashboard/src/components/Firewall.vue b/dashboard/src/components/Firewall.vue
index ca880d40e..34ce31160 100644
--- a/dashboard/src/components/Firewall.vue
+++ b/dashboard/src/components/Firewall.vue
@@ -1,13 +1,11 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { ref, onMounted, useTemplateRef, computed } from 'vue';
 import { Dialog, FormGroup } from 'pankow';
 import Section from  '../components/Section.vue';
 import NetworkModel from  '../models/NetworkModel.js';
 
-const networkModel = NetworkModel.create(API_ORIGIN, localStorage.token);
+const networkModel = NetworkModel.create();
 
 const blocklistLength = ref(0);
 const blocklist = ref('');
diff --git a/dashboard/src/components/FolderView.vue b/dashboard/src/components/FolderView.vue
index 2a8cea9d1..c239ab438 100644
--- a/dashboard/src/components/FolderView.vue
+++ b/dashboard/src/components/FolderView.vue
@@ -28,7 +28,6 @@ export default {
     FileUploader,
     InputDialog,
     MainLayout,
-    Menu,
     Notification,
     Breadcrumb,
     PreviewPanel,
diff --git a/dashboard/src/components/Ipv4Config.vue b/dashboard/src/components/Ipv4Config.vue
index a6d743e34..899e39583 100644
--- a/dashboard/src/components/Ipv4Config.vue
+++ b/dashboard/src/components/Ipv4Config.vue
@@ -1,13 +1,11 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { ref, onMounted, useTemplateRef, computed } from 'vue';
 import { Button, Dialog, Dropdown, FormGroup, TextInput } from 'pankow';
 import Section from  '../components/Section.vue';
 import NetworkModel from  '../models/NetworkModel.js';
 
-const networkModel = NetworkModel.create(API_ORIGIN, localStorage.token);
+const networkModel = NetworkModel.create();
 
 // keep in sync with sysinfo.js
 const providers = [
diff --git a/dashboard/src/components/Ipv6Config.vue b/dashboard/src/components/Ipv6Config.vue
index ee544722c..d178b0243 100644
--- a/dashboard/src/components/Ipv6Config.vue
+++ b/dashboard/src/components/Ipv6Config.vue
@@ -1,13 +1,11 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { ref, onMounted, useTemplateRef, computed } from 'vue';
 import { Button, Dialog, Dropdown, FormGroup, TextInput } from 'pankow';
 import Section from  '../components/Section.vue';
 import NetworkModel from  '../models/NetworkModel.js';
 
-const networkModel = NetworkModel.create(API_ORIGIN, localStorage.token);
+const networkModel = NetworkModel.create();
 
 // keep in sync with sysinfo.js
 const providers = [
diff --git a/dashboard/src/components/LogsViewer.vue b/dashboard/src/components/LogsViewer.vue
index 033aeb0ce..d960140ff 100644
--- a/dashboard/src/components/LogsViewer.vue
+++ b/dashboard/src/components/LogsViewer.vue
@@ -1,12 +1,9 @@
 <script>
 
 import { Button, InputDialog, TopBar, MainLayout } from 'pankow';
-
 import LogsModel from '../models/LogsModel.js';
 import AppsModel from '../models/AppsModel.js';
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 export default {
   name: 'LogsViewer',
   components: {
@@ -96,10 +93,10 @@ export default {
       return;
     }
 
-    this.logsModel = LogsModel.create(API_ORIGIN, this.accessToken, this.type, this.id);
+    this.logsModel = LogsModel.create(this.type, this.id);
 
     if (this.type === 'app') {
-      this.appsModel = AppsModel.create(API_ORIGIN, this.accessToken, this.id);
+      this.appsModel = AppsModel.create();
 
       try {
         const app = await this.appsModel.get();
diff --git a/dashboard/src/components/OpenIdClients.vue b/dashboard/src/components/OpenIdClients.vue
index 9c0a215f1..1327ec506 100644
--- a/dashboard/src/components/OpenIdClients.vue
+++ b/dashboard/src/components/OpenIdClients.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { useI18n } from 'vue-i18n';
 const i18n = useI18n();
 const t = i18n.t;
@@ -13,8 +11,8 @@ import Section from './Section.vue';
 import DashboardModel from '../models/DashboardModel.js';
 import UserDirectoryModel from '../models/UserDirectoryModel.js';
 
-const dashboardModel = DashboardModel.create(API_ORIGIN, localStorage.token);
-const userDirectoryModel = UserDirectoryModel.create(API_ORIGIN, localStorage.token);
+const dashboardModel = DashboardModel.create();
+const userDirectoryModel = UserDirectoryModel.create();
 
 const columns = {
   name: { label: 'Name', sort: true },
diff --git a/dashboard/src/components/PrivateRegistry.vue b/dashboard/src/components/PrivateRegistry.vue
index d0d7c4f4b..7b1e521ed 100644
--- a/dashboard/src/components/PrivateRegistry.vue
+++ b/dashboard/src/components/PrivateRegistry.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { useI18n } from 'vue-i18n';
 const i18n = useI18n();
 const t = i18n.t;
@@ -12,7 +10,7 @@ import { isValidDomainOrURL } from 'pankow/utils';
 import Section from '../components/Section.vue';
 import CloudronModel from '../models/CloudronModel.js';
 
-const cloudronModel = CloudronModel.create(API_ORIGIN, localStorage.token);
+const cloudronModel = CloudronModel.create();
 
 const providers = [
     { name: 'AWS', value: 'aws' },
diff --git a/dashboard/src/components/SyncDns.vue b/dashboard/src/components/SyncDns.vue
index 6e9253319..377e2971d 100644
--- a/dashboard/src/components/SyncDns.vue
+++ b/dashboard/src/components/SyncDns.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { ref, onMounted } from 'vue';
 import { Button, ProgressBar } from 'pankow';
 import { prettyLongDate } from 'pankow/utils';
@@ -10,8 +8,8 @@ import Section from '../components/Section.vue';
 import TasksModel from '../models/TasksModel.js';
 import DomainsModel from '../models/DomainsModel.js';
 
-const taskModel = TasksModel.create(API_ORIGIN, localStorage.token);
-const domainsModel = DomainsModel.create(API_ORIGIN, localStorage.token);
+const taskModel = TasksModel.create();
+const domainsModel = DomainsModel.create();
 
 const lastTask = ref({});
 const taskLogsMenu = ref([]);
diff --git a/dashboard/src/components/SystemUpdate.vue b/dashboard/src/components/SystemUpdate.vue
index d118a5b0a..6e63702f0 100644
--- a/dashboard/src/components/SystemUpdate.vue
+++ b/dashboard/src/components/SystemUpdate.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { ref, onMounted, useTemplateRef } from 'vue';
 import { Button, Dialog, ProgressBar, Radiobutton, MultiSelect } from 'pankow';
 import { prettyLongDate } from 'pankow/utils';
@@ -11,9 +9,9 @@ import UpdaterModel from '../models/UpdaterModel.js';
 import TasksModel from '../models/TasksModel.js';
 import DashboardModel from '../models/DashboardModel.js';
 
-const tasksModel = TasksModel.create(API_ORIGIN, localStorage.token);
-const updaterModel = UpdaterModel.create(API_ORIGIN, localStorage.token);
-const dashboardModel = DashboardModel.create(API_ORIGIN, localStorage.token);
+const tasksModel = TasksModel.create();
+const updaterModel = UpdaterModel.create();
+const dashboardModel = DashboardModel.create();
 
 // values correspond to cron days
 const cronDays = [
diff --git a/dashboard/src/components/Terminal.vue b/dashboard/src/components/Terminal.vue
index 911d66d17..a97b1364a 100644
--- a/dashboard/src/components/Terminal.vue
+++ b/dashboard/src/components/Terminal.vue
@@ -221,7 +221,7 @@ export default {
     this.id = id;
     this.name = id;
 
-    this.appsModel = AppsModel.create(API_ORIGIN, this.accessToken);
+    this.appsModel = AppsModel.create();
     this.directoryModel = createDirectoryModel(API_ORIGIN, this.accessToken, `apps/${id}`);
 
     const [error, app] = await this.appsModel.get(this.id);
diff --git a/dashboard/src/components/WellKnownDialog.vue b/dashboard/src/components/WellKnownDialog.vue
index 3639bcc83..c862f8d8d 100644
--- a/dashboard/src/components/WellKnownDialog.vue
+++ b/dashboard/src/components/WellKnownDialog.vue
@@ -1,14 +1,12 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { ref, useTemplateRef } from 'vue';
 import { Dialog, TextInput, FormGroup } from 'pankow';
 import DomainsModel from '../models/DomainsModel.js';
 
 const emit = defineEmits([ 'success' ]);
 
-const domainsModel = DomainsModel.create(API_ORIGIN, localStorage.token);
+const domainsModel = DomainsModel.create();
 
 const dialog = useTemplateRef('dialog');
 const busy = ref(false);
diff --git a/dashboard/src/models/AppPasswordsModel.js b/dashboard/src/models/AppPasswordsModel.js
index 88e1986fb..19bc6041c 100644
--- a/dashboard/src/models/AppPasswordsModel.js
+++ b/dashboard/src/models/AppPasswordsModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     name: 'AppPasswordsModel',
     async list() {
diff --git a/dashboard/src/models/ApplinksModel.js b/dashboard/src/models/ApplinksModel.js
index 9c94c0a74..f94c5ab07 100644
--- a/dashboard/src/models/ApplinksModel.js
+++ b/dashboard/src/models/ApplinksModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     name: 'ApplinksModel',
     async list() {
diff --git a/dashboard/src/models/AppsModel.js b/dashboard/src/models/AppsModel.js
index 2f337775c..c6590d180 100644
--- a/dashboard/src/models/AppsModel.js
+++ b/dashboard/src/models/AppsModel.js
@@ -64,7 +64,10 @@ function appProgressMessage(app) {
   return app.message || (app.error ? app.error.message : '');
 }
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   async function getTask(appId) {
     let error, result;
     try {
diff --git a/dashboard/src/models/AppstoreModel.js b/dashboard/src/models/AppstoreModel.js
index 771612958..6d7a63cc1 100644
--- a/dashboard/src/models/AppstoreModel.js
+++ b/dashboard/src/models/AppstoreModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     async list() {
       let error, result;
diff --git a/dashboard/src/models/CloudronModel.js b/dashboard/src/models/CloudronModel.js
index 585244071..305cadc8a 100644
--- a/dashboard/src/models/CloudronModel.js
+++ b/dashboard/src/models/CloudronModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     name: 'CloudronModel',
     async languages() {
diff --git a/dashboard/src/models/DashboardModel.js b/dashboard/src/models/DashboardModel.js
index d50c8e062..1cbd1f408 100644
--- a/dashboard/src/models/DashboardModel.js
+++ b/dashboard/src/models/DashboardModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     async getConfig() {
       let error, result;
diff --git a/dashboard/src/models/DomainsModel.js b/dashboard/src/models/DomainsModel.js
index e9a5fb3a9..5dc40dc74 100644
--- a/dashboard/src/models/DomainsModel.js
+++ b/dashboard/src/models/DomainsModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     async list() {
       let error, result;
diff --git a/dashboard/src/models/EventlogsModel.js b/dashboard/src/models/EventlogsModel.js
index 3ab6f7946..435f4c145 100644
--- a/dashboard/src/models/EventlogsModel.js
+++ b/dashboard/src/models/EventlogsModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     async search(actions, search, page, per_page) {
       let error, result;
diff --git a/dashboard/src/models/GroupsModel.js b/dashboard/src/models/GroupsModel.js
index e5a066dd2..a235ae15f 100644
--- a/dashboard/src/models/GroupsModel.js
+++ b/dashboard/src/models/GroupsModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     name: 'GroupsModel',
     async list() {
diff --git a/dashboard/src/models/LogsModel.js b/dashboard/src/models/LogsModel.js
index 7530df79e..57efe9180 100644
--- a/dashboard/src/models/LogsModel.js
+++ b/dashboard/src/models/LogsModel.js
@@ -24,7 +24,10 @@ function ab2str(buf) {
   return String.fromCharCode.apply(null, new Uint16Array(buf));
 }
 
-export function create(origin, accessToken, type, id) {
+export function create(type, id) {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   const INITIAL_STREAM_LINES = 100;
 
   let eventSource = null;
diff --git a/dashboard/src/models/NetworkModel.js b/dashboard/src/models/NetworkModel.js
index 319cf82e6..b3fe2f086 100644
--- a/dashboard/src/models/NetworkModel.js
+++ b/dashboard/src/models/NetworkModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     async getIpv4Config() {
       let error, result;
diff --git a/dashboard/src/models/ProfileModel.js b/dashboard/src/models/ProfileModel.js
index d5fd75c7a..1270221fd 100644
--- a/dashboard/src/models/ProfileModel.js
+++ b/dashboard/src/models/ProfileModel.js
@@ -2,7 +2,10 @@
 import { ROLES } from '../constants.js';
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     name: 'ProfileModel',
     async logout() {
diff --git a/dashboard/src/models/ServicesModel.js b/dashboard/src/models/ServicesModel.js
index ad01848e2..6636695da 100644
--- a/dashboard/src/models/ServicesModel.js
+++ b/dashboard/src/models/ServicesModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     async list() {
       let error, result;
diff --git a/dashboard/src/models/SystemModel.js b/dashboard/src/models/SystemModel.js
index 49aad8296..0a5df572d 100644
--- a/dashboard/src/models/SystemModel.js
+++ b/dashboard/src/models/SystemModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     async memory() {
       let error, result;
diff --git a/dashboard/src/models/TasksModel.js b/dashboard/src/models/TasksModel.js
index 6a16a3b06..1f076bc5a 100644
--- a/dashboard/src/models/TasksModel.js
+++ b/dashboard/src/models/TasksModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     async getLatestByType(type) {
       let error, result;
diff --git a/dashboard/src/models/TokensModel.js b/dashboard/src/models/TokensModel.js
index b460691f6..36eddd3d1 100644
--- a/dashboard/src/models/TokensModel.js
+++ b/dashboard/src/models/TokensModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     name: 'TokensModel',
     async list() {
diff --git a/dashboard/src/models/UpdaterModel.js b/dashboard/src/models/UpdaterModel.js
index f37490f08..61e44c06e 100644
--- a/dashboard/src/models/UpdaterModel.js
+++ b/dashboard/src/models/UpdaterModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     async info() {
       let error, result;
diff --git a/dashboard/src/models/UserDirectoryModel.js b/dashboard/src/models/UserDirectoryModel.js
index 35147d87b..f7ff1e7f2 100644
--- a/dashboard/src/models/UserDirectoryModel.js
+++ b/dashboard/src/models/UserDirectoryModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     async getGlobalProfileConfig() {
       let error, result;
diff --git a/dashboard/src/models/UsersModel.js b/dashboard/src/models/UsersModel.js
index dfee31336..f7f0f435c 100644
--- a/dashboard/src/models/UsersModel.js
+++ b/dashboard/src/models/UsersModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-function create(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     name: 'UsersModel',
     async list() {
diff --git a/dashboard/src/models/VolumesModel.js b/dashboard/src/models/VolumesModel.js
index dde9eb5b1..78fa1b00d 100644
--- a/dashboard/src/models/VolumesModel.js
+++ b/dashboard/src/models/VolumesModel.js
@@ -1,7 +1,10 @@
 
 import { fetcher } from 'pankow';
 
-export function createVolumesModel(origin, accessToken) {
+function create() {
+  const accessToken = localStorage.token;
+  const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
+
   return {
     name: 'VolumesModel',
     async list() {
@@ -93,5 +96,5 @@ export function createVolumesModel(origin, accessToken) {
 }
 
 export default {
-  createVolumesModel
+  create
 };
diff --git a/dashboard/src/views/AppsView.vue b/dashboard/src/views/AppsView.vue
index 99cd66bc0..3cf1950c8 100644
--- a/dashboard/src/views/AppsView.vue
+++ b/dashboard/src/views/AppsView.vue
@@ -1,19 +1,17 @@
 <script>
 
-import { Button, ButtonGroup, Dropdown, Icon, TableView, TextInput } from 'pankow';
+const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
 
+import { Button, ButtonGroup, Dropdown, Icon, TableView, TextInput } from 'pankow';
 import { APP_TYPES, HSTATES, ISTATES, RSTATES } from '../constants.js';
 import AppsModel from '../models/AppsModel.js';
 import ApplinksModel from '../models/ApplinksModel.js';
 import DomainsModel from '../models/DomainsModel.js';
 import ApplinkDialog from '../components/ApplinkDialog.vue';
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-const accessToken = localStorage.token;
-
-const appsModel = AppsModel.create(API_ORIGIN, accessToken);
-const domainsModel = DomainsModel.create(API_ORIGIN, accessToken);
-const applinksModel = ApplinksModel.create(API_ORIGIN, accessToken);
+const appsModel = AppsModel.create();
+const domainsModel = DomainsModel.create();
+const applinksModel = ApplinksModel.create();
 
 const VIEW_TYPE = {
   LIST: 'list',
@@ -161,7 +159,7 @@ export default {
         applink.installationState = ISTATES.INSTALLED;
         applink.runState = RSTATES.RUNNING;
         applink.health = HSTATES.HEALTHY;
-        applink.iconUrl = `/api/v1/applinks/${applink.id}/icon?access_token=${accessToken}&ts=${applink.ts}`;
+        applink.iconUrl = `/api/v1/applinks/${applink.id}/icon?access_token=${localStorage.token}&ts=${applink.ts}`;
         applink.accessLevel = this.$root.profile.isAtLeastAdmin ? 'admin' : 'user';
 
         apps.push(applink);
diff --git a/dashboard/src/views/AppstoreView.vue b/dashboard/src/views/AppstoreView.vue
index 94bd4cfcd..7fda88197 100644
--- a/dashboard/src/views/AppstoreView.vue
+++ b/dashboard/src/views/AppstoreView.vue
@@ -7,9 +7,7 @@ import AppInstallDialog from '../components/AppInstallDialog.vue';
 import ApplinkDialog from '../components/ApplinkDialog.vue';
 import { PROXY_APP_ID } from '../constants.js';
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
-const appstoreModel = AppstoreModel.create(API_ORIGIN, localStorage.token);
+const appstoreModel = AppstoreModel.create();
 
 const ready = ref(false);
 const proxyApp = ref();
diff --git a/dashboard/src/views/DomainsView.vue b/dashboard/src/views/DomainsView.vue
index 5b1e56ff2..393a42eb5 100644
--- a/dashboard/src/views/DomainsView.vue
+++ b/dashboard/src/views/DomainsView.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { useI18n } from 'vue-i18n';
 const i18n = useI18n();
 const t = i18n.t;
@@ -17,9 +15,10 @@ import Section from '../components/Section.vue';
 import DashboardModel from '../models/DashboardModel.js';
 import DomainsModel from '../models/DomainsModel.js';
 
-const dashboardModel = DashboardModel.create(API_ORIGIN, localStorage.token);
-const domainsModel = DomainsModel.create(API_ORIGIN, localStorage.token);
+const dashboardModel = DashboardModel.create();
+const domainsModel = DomainsModel.create();
 
+const busy = ref(false);
 const domains = ref([]);
 const search = ref('');
 const dashboardDomain = ref('');
@@ -113,12 +112,14 @@ async function refreshDomains() {
 }
 
 onMounted(async () => {
+  busy.value = true;
   await refreshDomains();
 
   const [error, result] = await dashboardModel.getConfig();
   if (error) return console.error(error);
 
   dashboardDomain.value = result.adminDomain;
+  busy.value = false;
 });
 
 </script>
@@ -137,17 +138,17 @@ onMounted(async () => {
 
       <p>{{ $t('domains.domainDialog.addDescription') }}</p>
 
-      <TableView :model="filteredDomains" :columns="columns" style="max-height: 200px;" @row-click="onEdit" :hover="false">
+      <TableView :model="filteredDomains" :columns="columns" :busy="busy" style="max-height: 200px;" @row-click="onEdit">
         <template #provider="domain">
           {{ prettyProviderName(domain) }}
         </template>
         <template #actions="domain">
           <div class="table-actions">
             <ButtonGroup>
-              <Button tool outline small secondary @click.stop="wellKnownDialog.open(domain)" v-tooltip="$t('domains.tooltipWellKnown')" icon="fa-solid fa-atlas" />
-              <Button tool outline small secondary @click.stop="onEdit(domain)" v-tooltip="$t('domains.tooltipEdit')" icon="fa-solid fa-pencil-alt" />
+              <Button tool small secondary @click.stop="wellKnownDialog.open(domain)" v-tooltip="$t('domains.tooltipWellKnown')" icon="fa-solid fa-atlas" />
+              <Button tool small secondary @click.stop="onEdit(domain)" v-tooltip="$t('domains.tooltipEdit')" icon="fa-solid fa-pencil-alt" />
             </ButtonGroup>
-            <Button tool outline small danger @click.stop="onRemove(domain)" v-tooltip="$t('domains.tooltipRemove')" :disabled="domain.domain === dashboardDomain" icon="fa-solid fa-trash-alt" />
+            <Button tool small danger @click.stop="onRemove(domain)" v-tooltip="$t('domains.tooltipRemove')" :disabled="domain.domain === dashboardDomain" icon="fa-solid fa-trash-alt" />
           </div>
         </template>
       </TableView>
diff --git a/dashboard/src/views/EventlogView.vue b/dashboard/src/views/EventlogView.vue
index 667bc0521..03580ca51 100644
--- a/dashboard/src/views/EventlogView.vue
+++ b/dashboard/src/views/EventlogView.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { useI18n } from 'vue-i18n';
 const i18n = useI18n();
 const t = i18n.t;
@@ -12,8 +10,8 @@ import { useDebouncedRef, prettyDate, prettyLongDate, prettyBinarySize } from 'p
 import AppsModel from '../models/AppsModel.js';
 import EventlogsModel from '../models/EventlogsModel.js';
 
-const appsModel = AppsModel.create(API_ORIGIN, localStorage.token);
-const eventlogsModel = EventlogsModel.create(API_ORIGIN, localStorage.token);
+const appsModel = AppsModel.create();
+const eventlogsModel = EventlogsModel.create();
 
 function getApp(id) {
   return apps.value.find(a => a.id === id);
diff --git a/dashboard/src/views/NetworkView.vue b/dashboard/src/views/NetworkView.vue
index b4dafb32b..023cb6738 100644
--- a/dashboard/src/views/NetworkView.vue
+++ b/dashboard/src/views/NetworkView.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { ref, onMounted, watch } from 'vue';
 import { Switch } from 'pankow';
 import Section from  '../components/Section.vue';
@@ -10,7 +8,7 @@ import Ipv6Config from '../components/Ipv6Config.vue';
 import Firewall from '../components/Firewall.vue';
 import NetworkModel from  '../models/NetworkModel.js';
 
-const networkModel = NetworkModel.create(API_ORIGIN, localStorage.token);
+const networkModel = NetworkModel.create();
 
 const dynDnsIsEnabled = ref(false);
 watch(dynDnsIsEnabled, async (newValue) => {
diff --git a/dashboard/src/views/ProfileView.vue b/dashboard/src/views/ProfileView.vue
index 1884a96a6..ff1940ace 100644
--- a/dashboard/src/views/ProfileView.vue
+++ b/dashboard/src/views/ProfileView.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { useI18n } from 'vue-i18n';
 const i18n = useI18n();
 const t = i18n.t;
@@ -17,9 +15,9 @@ import ProfileModel from '../models/ProfileModel.js';
 import CloudronModel from '../models/CloudronModel.js';
 import TokensModel from '../models/TokensModel.js';
 
-const profileModel = ProfileModel.create(API_ORIGIN, localStorage.token);
-const cloudronModel = CloudronModel.create(API_ORIGIN, localStorage.token);
-const tokensModel = TokensModel.create(API_ORIGIN, localStorage.token);
+const profileModel = ProfileModel.create();
+const cloudronModel = CloudronModel.create();
+const tokensModel = TokensModel.create();
 
 const config = ref({}); // TODO what is this?
 const user = ref({});
diff --git a/dashboard/src/views/ServicesView.vue b/dashboard/src/views/ServicesView.vue
index bb8cbf531..a031b8609 100644
--- a/dashboard/src/views/ServicesView.vue
+++ b/dashboard/src/views/ServicesView.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { useI18n } from 'vue-i18n';
 const i18n = useI18n();
 const t = i18n.t;
@@ -15,9 +13,9 @@ import ServicesModel from '../models/ServicesModel.js';
 import SystemModel from '../models/SystemModel.js';
 import AppsModel from '../models/AppsModel.js';
 
-const appsModel = AppsModel.create(API_ORIGIN, localStorage.token);
-const servicesModel = ServicesModel.create(API_ORIGIN, localStorage.token);
-const systemModel = SystemModel.create(API_ORIGIN, localStorage.token);
+const appsModel = AppsModel.create();
+const servicesModel = ServicesModel.create();
+const systemModel = SystemModel.create();
 
 const columns = {
   status: {},
diff --git a/dashboard/src/views/SettingsView.vue b/dashboard/src/views/SettingsView.vue
index 3a2715ddf..3f0b7bb23 100644
--- a/dashboard/src/views/SettingsView.vue
+++ b/dashboard/src/views/SettingsView.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { useI18n } from 'vue-i18n';
 const i18n = useI18n();
 const t = i18n.t;
@@ -14,7 +12,7 @@ import SystemUpdate from '../components/SystemUpdate.vue';
 import PrivateRegistry from '../components/PrivateRegistry.vue';
 import CloudronModel from '../models/CloudronModel.js';
 
-const cloudronModel = CloudronModel.create(API_ORIGIN, localStorage.token);
+const cloudronModel = CloudronModel.create();
 
 // Timezone
 const allTimezones = window.timezones;
diff --git a/dashboard/src/views/UserDirectoryView.vue b/dashboard/src/views/UserDirectoryView.vue
index 5a47cc8a9..c7534de35 100644
--- a/dashboard/src/views/UserDirectoryView.vue
+++ b/dashboard/src/views/UserDirectoryView.vue
@@ -1,7 +1,5 @@
 <script setup>
 
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-
 import { ref, onMounted } from 'vue';
 import { Button, Checkbox } from 'pankow';
 import Section from '../components/Section.vue';
@@ -10,7 +8,7 @@ import ExposedLdap from '../components/ExposedLdap.vue';
 import OpenIdClients from '../components/OpenIdClients.vue';
 import UserDirectoryModel from '../models/UserDirectoryModel.js';
 
-const userDirectoryModel = UserDirectoryModel.create(API_ORIGIN, localStorage.token);
+const userDirectoryModel = UserDirectoryModel.create();
 
 const editableUserProfiles = ref(false);
 const mandatory2FA = ref(false);
diff --git a/dashboard/src/views/VolumesView.vue b/dashboard/src/views/VolumesView.vue
index 9b0352f76..f0e7d70ac 100644
--- a/dashboard/src/views/VolumesView.vue
+++ b/dashboard/src/views/VolumesView.vue
@@ -1,15 +1,10 @@
 <script>
 
 import { Button, ButtonGroup, Checkbox, Dialog, Dropdown, FormGroup, InputDialog, NumberInput, PasswordInput, TableView, TextInput } from 'pankow';
-
 import Section from  '../components/Section.vue';
+import VolumesModel from '../models/VolumesModel.js';
 
-import { createVolumesModel } from '../models/VolumesModel.js';
-
-const API_ORIGIN = import.meta.env.VITE_API_ORIGIN ? import.meta.env.VITE_API_ORIGIN : window.location.origin;
-const accessToken = localStorage.token;
-
-const volumesModel = createVolumesModel(API_ORIGIN, accessToken);
+const volumesModel = VolumesModel.create();
 
 export default {
   name: 'VolumesView',