diff --git a/src/main/oshelper.cpp b/src/main/oshelper.cpp
index d44fc8c2..2ca0e400 100644
--- a/src/main/oshelper.cpp
+++ b/src/main/oshelper.cpp
@@ -43,6 +43,8 @@
 #include <QFileInfo>
 #include <QString>
 #include <QUrl>
+#include <QByteArray>
+#include <QRandomGenerator>
 #ifdef Q_OS_MAC
 #include "qt/macoshelper.h"
 #endif
@@ -246,6 +248,18 @@ QString OSHelper::temporaryPath() const
     return QDir::tempPath();
 }
 
+QString OSHelper::randomPassword(int numBytes) const
+{
+    numBytes = qBound(16, numBytes, 128);
+
+    QByteArray buf(numBytes, Qt::Uninitialized);
+    auto *rng = QRandomGenerator::system();
+    for (int i = 0; i < numBytes; ++i)
+        buf[i] = char(rng->generate() & 0xFF);
+
+    return QString::fromLatin1(buf.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals));
+}
+
 bool OSHelper::installed() const
 {
 #ifdef Q_OS_WIN
diff --git a/src/main/oshelper.h b/src/main/oshelper.h
index 4242cc05..dc3058dd 100644
--- a/src/main/oshelper.h
+++ b/src/main/oshelper.h
@@ -51,6 +51,7 @@ public:
     Q_INVOKABLE QString openSaveFileDialog(const QString &title, const QString &folder, const QString &filename) const;
     Q_INVOKABLE QString temporaryFilename() const;
     Q_INVOKABLE QString temporaryPath() const;
+    Q_INVOKABLE QString randomPassword(int numBytes = 32) const;
     Q_INVOKABLE bool removeTemporaryWallet(const QString &walletName) const;
     Q_INVOKABLE bool isCapsLock() const;
     Q_INVOKABLE quint8 getNetworkTypeFromFile(const QString &keysPath) const;
diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml
index 1bc5ca96..eb727098 100644
--- a/wizard/WizardController.qml
+++ b/wizard/WizardController.qml
@@ -345,7 +345,7 @@ Rectangle {
         console.log("Creating temporary wallet", tmp_wallet_filename)
         var nettype = appWindow.persistentSettings.nettype;
         var kdfRounds = appWindow.persistentSettings.kdfRounds;
-        var wallet = walletManager.createWallet(tmp_wallet_filename, "", persistentSettings.language_wallet, nettype, kdfRounds)
+        var wallet = walletManager.createWallet(tmp_wallet_filename, oshelper.randomPassword(), persistentSettings.language_wallet, nettype, kdfRounds)
 
         wizardController.walletOptionsSeed = wallet.seed
 
@@ -479,7 +479,7 @@ Rectangle {
         var deviceName = wizardController.walletOptionsDeviceName;
 
         connect();
-        walletManager.createWalletFromDeviceAsync(tmpWalletFilename, "", nettype, deviceName, restoreHeight, subaddressLookahead, kdfRounds);
+        walletManager.createWalletFromDeviceAsync(tmpWalletFilename, oshelper.randomPassword(), nettype, deviceName, restoreHeight, subaddressLookahead, kdfRounds);
         creatingWalletDeviceSplash();
     }