diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/RegisterFinishRequestJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/RegisterFinishRequestJson.kt
index b3914cc97d..bed89d1f5a 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/RegisterFinishRequestJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/RegisterFinishRequestJson.kt
@@ -1,7 +1,6 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.model
 
 import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterFinishRequestJson.Keys
-import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterRequestJson.Keys
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -9,12 +8,12 @@ import kotlinx.serialization.Serializable
  * Request body for register.
  *
  * @param email the email to be registered.
+ * @param emailVerificationToken token used to finish the registration process.
  * @param masterPasswordHash the master password (encrypted).
  * @param masterPasswordHint the hint for the master password (nullable).
- * @param emailVerificationToken token used to finish the registration process.
  * @param captchaResponse the captcha bypass token.
- * @param key the user key for the request (encrypted).
- * @param keys a [Keys] object containing public and private keys.
+ * @param userSymmetricKey the user key for the request (encrypted).
+ * @param userAsymmetricKeys a [Keys] object containing public and private keys.
  * @param kdfType the kdf type represented as an [Int].
  * @param kdfIterations the number of kdf iterations.
  */
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt
index 729b19191b..a2bb4f98fb 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceImpl.kt
@@ -53,10 +53,7 @@ class IdentityServiceImpl(
             .registerFinish(body)
             .recoverCatching { throwable ->
                 val bitwardenError = throwable.toBitwardenError()
-                bitwardenError.parseErrorBodyOrNull<RegisterResponseJson.CaptchaRequired>(
-                    code = 400,
-                    json = json,
-                ) ?: bitwardenError.parseErrorBodyOrNull<RegisterResponseJson.Invalid>(
+                bitwardenError.parseErrorBodyOrNull<RegisterResponseJson.Invalid>(
                     codes = listOf(400, 429),
                     json = json,
                 ) ?: bitwardenError.parseErrorBodyOrNull<RegisterResponseJson.Error>(
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailViewModel.kt
index 6c3e3e44ed..40ee453590 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailViewModel.kt
@@ -15,7 +15,6 @@ private const val KEY_STATE = "state"
 /**
  * Models logic for the check email screen.
  */
-@Suppress("TooManyFunctions")
 @HiltViewModel
 class CheckEmailViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
@@ -65,7 +64,7 @@ sealed class CheckEmailEvent {
     data object NavigateToEmailApp : CheckEmailEvent()
 
     /**
-     * Navigate to email app.
+     * Navigate to landing screen.
      */
     data object NavigateBackToLanding : CheckEmailEvent()
 }
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationNavigation.kt
index d94ea8a589..9f90c646cd 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationNavigation.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationNavigation.kt
@@ -17,7 +17,7 @@ private const val COMPLETE_REGISTRATION_ROUTE =
     "$COMPLETE_REGISTRATION_PREFIX/{$EMAIL_ADDRESS}/{$VERIFICATION_TOKEN}/{$FROM_EMAIL}"
 
 /**
- * Class to retrieve login with device arguments from the [SavedStateHandle].
+ * Class to retrieve complete registration arguments from the [SavedStateHandle].
  */
 @OmitFromCoverage
 data class CompleteRegistrationArgs(
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt
index 9d423c748a..1567ffb92d 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingViewModel.kt
@@ -160,7 +160,7 @@ class LandingViewModel @Inject constructor(
     }
 
     private fun handleCreateAccountClicked() {
-        // TODO ADD FEATURE FLAG email-verification
+        // TODO PM-9401: ADD FEATURE FLAG email-verification
         if (true)
             sendEvent(LandingEvent.NavigateToStartRegistration)
         else
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationViewModel.kt
index 80c10ffa91..938f04a583 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationViewModel.kt
@@ -294,7 +294,7 @@ sealed class StartRegistrationEvent {
     ) : StartRegistrationEvent()
 
     /**
-     * Navigates to the complete registration screen.
+     * Navigates to the check email screen.
      */
     data class NavigateToCheckEmail(
         val email: String,
@@ -326,7 +326,7 @@ sealed class StartRegistrationEvent {
  */
 sealed class StartRegistrationAction {
     /**
-     * User clicked submit.
+     * User clicked continue.
      */
     data object ContinueClick : StartRegistrationAction()