diff --git a/app/src/main/java/com/futo/circles/core/Constants.kt b/app/src/main/java/com/futo/circles/core/Constants.kt
index 8bd7c5d8a85c5d9fa0e40826dd6e62147808ed24..1167153d7217af2aad9e82541608ec1b4dd7541c 100644
--- a/app/src/main/java/com/futo/circles/core/Constants.kt
+++ b/app/src/main/java/com/futo/circles/core/Constants.kt
@@ -2,7 +2,7 @@ package com.futo.circles.core
 
 const val FILE_PROVIDER_AUTHORITY_PREFIX = ".provider"
 
-const val REGISTRATION_TOKEN_KEY = "org.matrix.msc3231.login.registration_token"
+const val REGISTRATION_TOKEN_KEY_PREFIX = "login.registration_token"
 
 const val TERMS_URL_EXTENSION = "_matrix/consent"
 const val VALIDATION_TOKEN_SUBMIT_URL_PREFIX = "_matrix/identity/api/v1/validate/email/submitToken"
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/SignUpDataSource.kt b/app/src/main/java/com/futo/circles/feature/sign_up/SignUpDataSource.kt
index 38d17cd441f8be210377962418fdfc2d841ea366..21f8ab6644445080f25446852367712ccee6832e 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/SignUpDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/SignUpDataSource.kt
@@ -3,7 +3,7 @@ package com.futo.circles.feature.sign_up
 import android.content.Context
 import androidx.lifecycle.MutableLiveData
 import com.futo.circles.R
-import com.futo.circles.core.REGISTRATION_TOKEN_KEY
+import com.futo.circles.core.REGISTRATION_TOKEN_KEY_PREFIX
 import com.futo.circles.core.SingleEventLiveData
 import com.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
 import com.futo.circles.core.matrix.room.CoreSpacesTreeBuilder
@@ -93,12 +93,11 @@ class SignUpDataSource(
     }
 
     private fun handleStageOther(type: String): NavigationEvents =
-        when (type) {
-            REGISTRATION_TOKEN_KEY -> NavigationEvents.TokenValidation
-            else -> throw IllegalArgumentException(
-                context.getString(R.string.not_supported_stage_format, type)
-            )
-        }
+        if (type.endsWith(REGISTRATION_TOKEN_KEY_PREFIX)) NavigationEvents.TokenValidation
+        else throw IllegalArgumentException(
+            context.getString(R.string.not_supported_stage_format, type)
+        )
+
 
     private fun updatePageSubtitle() {
         val size = stagesToComplete.size