diff --git a/lib/encryption/cross_signing.dart b/lib/encryption/cross_signing.dart
index b1fc9f44..e35c3a4a 100644
--- a/lib/encryption/cross_signing.dart
+++ b/lib/encryption/cross_signing.dart
@@ -70,9 +70,13 @@ class CrossSigning {
             null;
   }
 
-  Future<void> selfSign({String passphrase, String recoveryKey}) async {
+  Future<void> selfSign(
+      {String passphrase, String recoveryKey, String keyOrPassphrase}) async {
     final handle = encryption.ssss.open(EventTypes.CrossSigningMasterKey);
-    await handle.unlock(passphrase: passphrase, recoveryKey: recoveryKey);
+    await handle.unlock(
+        passphrase: passphrase,
+        recoveryKey: recoveryKey,
+        keyOrPassphrase: keyOrPassphrase);
     await handle.maybeCacheAll();
     final masterPrivateKey =
         base64.decode(await handle.getStored(EventTypes.CrossSigningMasterKey));