diff --git a/changelog.d/3691.feature b/changelog.d/3691.feature
new file mode 100644
index 0000000000..ae139681b0
--- /dev/null
+++ b/changelog.d/3691.feature
@@ -0,0 +1 @@
+ Support accept 3pid invite when email is not bound to account
\ No newline at end of file
diff --git a/changelog.d/3695.feature b/changelog.d/3695.feature
new file mode 100644
index 0000000000..bd5934529d
--- /dev/null
+++ b/changelog.d/3695.feature
@@ -0,0 +1 @@
+Update Email invite to be aware of spaces
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index 5ea38ff682..c3bcef60f2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -123,7 +123,7 @@ internal class DefaultRoomService @Inject constructor(
         joinRoomTask.execute(JoinRoomTask.Params(roomIdOrAlias, reason, viaServers))
     }
 
-    override suspend fun joinRoom(roomIdOrAlias: String,
+    override suspend fun joinRoom(roomId: String,
                                   reason: String?,
                                   thirdPartySigned: SignInvitationResult) {
         joinRoomTask.execute(JoinRoomTask.Params(roomIdOrAlias, reason, thirdPartySigned = thirdPartySigned))