2 files changed, 18 insertions, 9 deletions

diff --git a/components/package/contents/ui/AccountSwitcher.qml b/components/package/contents/ui/AccountSwitcher.qml
index da878acf..6a9d2deb 100644
--- a/components/package/contents/ui/AccountSwitcher.qml
+++ b/components/package/contents/ui/AccountSwitcher.qml
@@ -165,16 +165,20 @@ Button {
                         onClicked: {
                             editAccountComponent.createObject(app)
                         }
-                    }
-                }
-            }
 
-            Component {
-                id: editAccountComponent
+                        Component {
+                            id: editAccountComponent
+
+                            KubeComponents.EditAccountDialog {
+                                id: editAccount
 
-                KubeComponents.EditAccountDialog {
-                    id: editAccount
-                    anchors.fill: parent
+                                anchors.fill: parent
+
+                                //accountId: accountFactory.accountId
+                                uiSource: accountFactory.uiPath
+                            }
+                        }
+                    }
                 }
             }
         }
diff --git a/components/package/contents/ui/EditAccountDialog.qml b/components/package/contents/ui/EditAccountDialog.qml
index 2fac4227..24f8b5e2 100644
--- a/components/package/contents/ui/EditAccountDialog.qml
+++ b/components/package/contents/ui/EditAccountDialog.qml
@@ -28,8 +28,9 @@ import org.kube.framework.theme 1.0
 Rectangle {
     id: root
 
-    color: ColorPalette.border
+    property variant uiSource
 
+    color: ColorPalette.border
     opacity: 0.9
 
     MouseArea {
@@ -51,5 +52,9 @@ Rectangle {
         MouseArea {
             anchors.fill: parent
         }
+
+        Loader {
+            source: uiSource
+        }
     }
 }