1 files changed, 12 insertions, 3 deletions

diff --git a/main.cpp b/main.cpp
index 0e0d58e3..917f1e58 100644
--- a/main.cpp
+++ b/main.cpp
@@ -116,12 +116,21 @@ int main(int argc, char *argv[])
 #endif
 
     if (!moneroAccountsRootDir.empty()) {
-        QString moneroAccountsDir = moneroAccountsRootDir.at(0) + "/Monero Accounts";
-        QDir tempDir;
-        tempDir.mkpath(moneroAccountsDir);
+        QString moneroAccountsDir = moneroAccountsRootDir.at(0) + "/Monero/wallets";
         engine.rootContext()->setContextProperty("moneroAccountsDir", moneroAccountsDir);
     }
 
+
+    // Get default account name
+    QString accountName = qgetenv("USER"); // mac/linux
+    if (accountName.isEmpty()){
+        accountName = qgetenv("USERNAME"); // Windows
+    }
+    if (accountName.isEmpty()) {
+        accountName = "My monero Account";
+    }
+
+    engine.rootContext()->setContextProperty("defaultAccountName", accountName);
     engine.rootContext()->setContextProperty("applicationDirectory", QApplication::applicationDirPath());
     engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
     QObject *rootObject = engine.rootObjects().first();