diff --git a/src/jamidht/accountarchive.h b/src/jamidht/accountarchive.h
index eea1615067ec51c039235eff22e4b70df0089235..00dad2f409cd15f1438c91ff75c6c8d69e11f2f9 100644
--- a/src/jamidht/accountarchive.h
+++ b/src/jamidht/accountarchive.h
@@ -62,7 +62,7 @@ struct AccountArchive
 
     AccountArchive() = default;
     AccountArchive(const std::vector<uint8_t>& data, const std::vector<uint8_t>& password_salt = {}) { deserialize(data, password_salt); }
-    AccountArchive(const std::filesystem::path& path, std::string_view scheme, const std::string& pwd) { load(path, scheme, pwd); }
+    AccountArchive(const std::filesystem::path& path, std::string_view scheme = {}, const std::string& pwd = {}) { load(path, scheme, pwd); }
 
     /** Serialize structured archive data to memory. */
     std::string serialize() const;
diff --git a/src/jamidht/jamiaccount.h b/src/jamidht/jamiaccount.h
index 64a01e522c64347d3028da797b4d64237f9328bc..0e25fc6c20ddadfaa6592171f94953a5f2850b21 100644
--- a/src/jamidht/jamiaccount.h
+++ b/src/jamidht/jamiaccount.h
@@ -345,7 +345,7 @@ public:
      * @return if the archive was exported
      */
     bool exportArchive(const std::string& destinationPath, std::string_view scheme = {}, const std::string& password = {});
-    bool revokeDevice(const std::string& device, std::string_view scheme, const std::string& password = {});
+    bool revokeDevice(const std::string& device, std::string_view scheme = {}, const std::string& password = {});
     std::map<std::string, std::string> getKnownDevices() const;
 
     bool isPasswordValid(const std::string& password);
diff --git a/test/unitTest/account_archive/migration.cpp b/test/unitTest/account_archive/migration.cpp
index ec64f27a9f33201ef523a6377c82ad9c1796def8..7aaa10e55e8ea3914f4879b181cecc704cee15f8 100644
--- a/test/unitTest/account_archive/migration.cpp
+++ b/test/unitTest/account_archive/migration.cpp
@@ -106,14 +106,14 @@ MigrationTest::testLoadExpiredAccount()
     // Get alice's expiration
     auto archivePath = fileutils::get_data_dir() / aliceAccount->getAccountID() / "archive.gz";
     auto devicePath = fileutils::get_data_dir() / aliceAccount->getAccountID() / "ring_device.crt";
-    auto archive = AccountArchive(archivePath, "");
+    auto archive = AccountArchive(archivePath);
     auto deviceCert = dht::crypto::Certificate(fileutils::loadFile(devicePath));
     auto deviceExpiration = deviceCert.getExpiration();
     auto accountExpiration = archive.id.second->getExpiration();
 
     // Update validity
     CPPUNIT_ASSERT(aliceAccount->setValidity("", "", {}, 9));
-    archive = AccountArchive(archivePath, "");
+    archive = AccountArchive(archivePath);
     deviceCert = dht::crypto::Certificate(fileutils::loadFile(devicePath));
     auto newDeviceExpiration = deviceCert.getExpiration();
     auto newAccountExpiration = archive.id.second->getExpiration();
@@ -144,7 +144,7 @@ MigrationTest::testLoadExpiredAccount()
     aliceAccount->forceReloadAccount();
     CPPUNIT_ASSERT(cv.wait_for(lk, 15s, [&]() { return aliceMigrated; }));
 
-    archive = AccountArchive(archivePath, "");
+    archive = AccountArchive(archivePath);
     deviceCert = dht::crypto::Certificate(fileutils::loadFile(devicePath));
     deviceExpiration = deviceCert.getExpiration();
     accountExpiration = archive.id.second->getExpiration();
@@ -213,7 +213,7 @@ MigrationTest::testMigrationAfterRevokation()
 
     // Revoke bob2
     auto bob2Device = std::string(bob2Account->currentDeviceId());
-    bobAccount->revokeDevice("", bob2Device);
+    bobAccount->revokeDevice(bob2Device);
     CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&]() { return deviceRevoked; }));
     // Note: bob2 will need some seconds to get the revokation list
     std::this_thread::sleep_for(10s);
diff --git a/test/unitTest/namedirectory/namedirectory.cpp b/test/unitTest/namedirectory/namedirectory.cpp
index ac5e41ba6cb9e95817852ac8d2799b047728f575..781f330b3161b4653565a6485864c3d61a1d4552 100644
--- a/test/unitTest/namedirectory/namedirectory.cpp
+++ b/test/unitTest/namedirectory/namedirectory.cpp
@@ -196,7 +196,7 @@ NameDirectoryTest::testRegisterName()
             cv.notify_one();
         }));
     libjami::registerSignalHandlers(confHandlers);
-    CPPUNIT_ASSERT(libjami::registerName(aliceId, "", "password", "foo"));
+    CPPUNIT_ASSERT(libjami::registerName(aliceId, "foo"));
     CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&] { return nameRegistered; }));
 }