1 files changed, 3 insertions, 0 deletions
diff --git a/lib/connection.cpp b/lib/connection.cpp
index 20fb367c..ff066def 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -254,6 +254,9 @@ void Connection::doConnectToServer(const QString& user, const QString& password,
 
             AccountSettings accountSettings(loginJob->userId());
             d->encryptionManager.reset(new EncryptionManager(accountSettings.encryptionAccountPickle()));
+            if (accountSettings.encryptionAccountPickle().isEmpty()) {
+                accountSettings.setEncryptionAccountPickle(d->encryptionManager->olmAccountPickle());
+            }
 
             d->encryptionManager->uploadIdentityKeys(this);
             d->encryptionManager->uploadOneTimeKeys(this);