diff --git a/lib/encryption/utils/bootstrap.dart b/lib/encryption/utils/bootstrap.dart
index 7b778c7b..0354490c 100644
--- a/lib/encryption/utils/bootstrap.dart
+++ b/lib/encryption/utils/bootstrap.dart
@@ -453,6 +453,7 @@ class Bootstrap {
       }
       // upload the keys!
       state = BootstrapState.loading;
+      Logs().v('Upload device signing keys.');
       await client.uiaRequestBackground(
           (AuthenticationData auth) => client.uploadDeviceSigningKeys(
                 masterKey: masterKey,
@@ -460,6 +461,7 @@ class Bootstrap {
                 userSigningKey: userSigningKey,
                 auth: auth,
               ));
+      Logs().v('Device signing keys have been uploaded.');
       // aaaand set the SSSS secrets
       final futures = <Future<void>>[];
       if (masterKey != null) {
@@ -481,6 +483,7 @@ class Bootstrap {
               .then((_) =>
                   Logs().v('New Key with type ${entry.key} was created')),
         );
+        Logs().v('Store new SSSS key ${entry.key}...');
         await newSsssKey.store(entry.key, entry.value);
       }
       Logs().v(
diff --git a/lib/src/client.dart b/lib/src/client.dart
index 7b8ac86a..72935624 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -471,10 +471,11 @@ class Client extends MatrixApi {
           completer.complete(uia.result);
         } else if (state == UiaRequestState.fail) {
           completer.completeError(uia.error);
+        } else {
+          onUiaRequest.add(uia);
         }
       },
     );
-    onUiaRequest.add(uia);
     return completer.future;
   }