diff --git a/tine20/Tinebase/js/LoginPanel.js b/tine20/Tinebase/js/LoginPanel.js
index fda6ab0b7ee..175f9afdf05 100644
--- a/tine20/Tinebase/js/LoginPanel.js
+++ b/tine20/Tinebase/js/LoginPanel.js
@@ -306,7 +306,7 @@ Tine.Tinebase.LoginPanel = Ext.extend(Ext.BoxComponent, {
             return
         }
         try {
-            const rfc4648 = await import('rfc4648');
+            const rfc4648 = await import(/* webpackChunkName: "Tinebase/js/rfc4648"*/'rfc4648');
 
             if(this._credGetAbortController) this._credGetAbortController.abort()
             this._credGetAbortController = new AbortController()
diff --git a/tine20/Tinebase/js/ux/vue/PersonaContainer/index.js b/tine20/Tinebase/js/ux/vue/PersonaContainer/index.js
index 8c4c3f68f47..f54ed156901 100644
--- a/tine20/Tinebase/js/ux/vue/PersonaContainer/index.js
+++ b/tine20/Tinebase/js/ux/vue/PersonaContainer/index.js
@@ -1,3 +1,4 @@
+import {default as vPersonaContainer} from './PersonaContainer.vue'
 Ext.ns("Tine.ux.vue")
 Ext.ns("Tine.personas")
 
@@ -29,10 +30,8 @@ export const PersonaContainer = Ext.extend(Ext.BoxComponent, {
 
     onRender: async function (ct, position){
         Ext.BoxComponent.superclass.onRender.call(this, ct, position)
-        window.vue = window.vue || await import(/* webpackChunkName: "Tinebase/js/Vue-Runtime" */"tine-vue")
-        const { default: PersonaContainer } = await import("./PersonaContainer.vue")
-        this.app = vue.createApp(
-            PersonaContainer,
+        this.app = window.vue.createApp(
+            vPersonaContainer,
             {
                 iconName: this.initialConfig.persona,
                 skinColor: this.initialConfig.skinColor
diff --git a/tine20/Tinebase/js/widgets/dialog/vue/PasswordChangeDialog/index.js b/tine20/Tinebase/js/widgets/dialog/vue/PasswordChangeDialog/index.js
index 0fcbd10e0cf..85ee9e6b678 100644
--- a/tine20/Tinebase/js/widgets/dialog/vue/PasswordChangeDialog/index.js
+++ b/tine20/Tinebase/js/widgets/dialog/vue/PasswordChangeDialog/index.js
@@ -37,7 +37,7 @@ Tine.Tinebase.PasswordChangeDialog = Ext.extend(Tine.widgets.dialog.ModalDialog,
             passwordLabel: this.passwordLabel,
             dialogText: this.dialogText
         })
-        const { default: PasswordChangeDialog } = await import(/* webpackChunkName: "Tinebase/vue/PasswordChangeDialog"*/'./PasswordChangeDialog.vue')
+        const { default: PasswordChangeDialog } = await import(/* webpackChunkName: "Tinebase/js/vPasswordChangeDialog"*/'./PasswordChangeDialog.vue')
         this.dlgContentComponent = PasswordChangeDialog
         this.vueEventBus.on('close', this.destroy.bind(this))
         this.vueEventBus.on('cancel', this.destroy.bind(this))
diff --git a/tine20/Tinebase/js/widgets/dialog/vue/PasswordDialog/index.js b/tine20/Tinebase/js/widgets/dialog/vue/PasswordDialog/index.js
index 589c2264ef8..6006b439b94 100644
--- a/tine20/Tinebase/js/widgets/dialog/vue/PasswordDialog/index.js
+++ b/tine20/Tinebase/js/widgets/dialog/vue/PasswordDialog/index.js
@@ -75,7 +75,7 @@ Tine.Tinebase.widgets.dialog.PasswordDialog = Ext.extend(Tine.widgets.dialog.Mod
 
         this.injected['genPW'] = this.genPW.bind(this)
 
-        const { default: PasswordDialog } = await import(/* webpackChunkName: "Tinebase/vue/PasswordDialog"*/'./PasswordDialog.vue')
+        const { default: PasswordDialog } = await import(/* webpackChunkName: "Tinebase/js/vPasswordDialog"*/'./PasswordDialog.vue')
 
         this.dlgContentComponent = PasswordDialog
         this.postInit()
diff --git a/tine20/library/ExtJS/src/widgets/ColorPalette.js b/tine20/library/ExtJS/src/widgets/ColorPalette.js
index 938a30ef432..18e5efd6b94 100644
--- a/tine20/library/ExtJS/src/widgets/ColorPalette.js
+++ b/tine20/library/ExtJS/src/widgets/ColorPalette.js
@@ -233,8 +233,7 @@ cp.colors = ['000000', '993300', '333300'];
     renderColorPicker: async function () {
         const me = this;
 
-        window.vue = window.vue || await import(/* webpackChunkName: "Tinebase/js/Vue-Runtime"*/"tine-vue")
-        const {createApp, h} = await import("vue");
+        const {createApp, h} = window.vue
         const {default: ColorPickerApp} = await import(/* webpackChunkName: "Tinebase/js/ColorPickerApp" */ 'ux/form/ColorPickerApp.vue');
 
         const colorPickerApp = new Ext.Component({
diff --git a/tine20/library/ExtJS/src/widgets/form/VueAlert/index.js b/tine20/library/ExtJS/src/widgets/form/VueAlert/index.js
index 3362c0098fa..b9939c3f448 100644
--- a/tine20/library/ExtJS/src/widgets/form/VueAlert/index.js
+++ b/tine20/library/ExtJS/src/widgets/form/VueAlert/index.js
@@ -11,7 +11,7 @@ Ext.form.VueAlert = Ext.extend(Ext.BoxComponent, {
 
     initComponent: async function() {
         const {createApp, h, reactive} = window.vue
-        const {default: VueAlert} = await import(/* webpackChunkName: "Tinebase/vue/VueAlert"*/'./VueAlert.vue')
+        const {default: VueAlert} = await import(/* webpackChunkName: "Tinebase/js/VueAlert"*/'./VueAlert.vue')
         this.props = reactive({
             label: this.label,
             variant: this.variant