diff --git a/packages/auth/src/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes.spec.ts b/packages/auth/src/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes.spec.ts
index 1ddeb664c..11f3b31d9 100644
--- a/packages/auth/src/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes.spec.ts
+++ b/packages/auth/src/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes.spec.ts
@@ -81,7 +81,7 @@ describe('SignInWithRecoveryCodes', () => {
     })
 
     expect(result.isFailed()).toBe(true)
-    expect(result.getError()).toBe('Invalid email or password')
+    expect(result.getError()).toBe('Empty password')
   })
 
   it('should return error if username is not provided', async () => {
@@ -107,7 +107,7 @@ describe('SignInWithRecoveryCodes', () => {
     })
 
     expect(result.isFailed()).toBe(true)
-    expect(result.getError()).toBe('Invalid email or password')
+    expect(result.getError()).toBe('Invalid code verifier')
   })
 
   it('should return error if recovery codes are not provided', async () => {
@@ -120,7 +120,7 @@ describe('SignInWithRecoveryCodes', () => {
     })
 
     expect(result.isFailed()).toBe(true)
-    expect(result.getError()).toBe('Invalid recovery codes')
+    expect(result.getError()).toBe('Empty recovery codes')
   })
 
   it('should return error if code verifier is invalid', async () => {
@@ -135,7 +135,7 @@ describe('SignInWithRecoveryCodes', () => {
     })
 
     expect(result.isFailed()).toBe(true)
-    expect(result.getError()).toBe('Invalid email or password')
+    expect(result.getError()).toBe('Invalid code verifier')
   })
 
   it('should return error if user is not found', async () => {
@@ -150,7 +150,7 @@ describe('SignInWithRecoveryCodes', () => {
     })
 
     expect(result.isFailed()).toBe(true)
-    expect(result.getError()).toBe('Invalid email or password')
+    expect(result.getError()).toBe('Could not find user')
   })
 
   it('should return error if recovery codes are invalid', async () => {
@@ -176,7 +176,7 @@ describe('SignInWithRecoveryCodes', () => {
     })
 
     expect(result.isFailed()).toBe(true)
-    expect(result.getError()).toBe('Invalid email or password')
+    expect(result.getError()).toBe('Invalid password')
   })
 
   it('should return error if recovery codes are not generated for user', async () => {
diff --git a/packages/auth/src/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes.ts b/packages/auth/src/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes.ts
index 3a33bc86c..6b4c9da85 100644
--- a/packages/auth/src/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes.ts
+++ b/packages/auth/src/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes.ts
@@ -40,21 +40,21 @@ export class SignInWithRecoveryCodes implements UseCaseInterface<AuthResponse202
     if (!validCodeVerifier) {
       await this.increaseLoginAttempts.execute({ email: username.value })
 
-      return Result.fail('Invalid email or password')
+      return Result.fail('Invalid code verifier')
     }
 
     const passwordValidationResult = Validator.isNotEmpty(dto.password)
     if (passwordValidationResult.isFailed()) {
       await this.increaseLoginAttempts.execute({ email: username.value })
 
-      return Result.fail('Invalid email or password')
+      return Result.fail('Empty password')
     }
 
     const recoveryCodesValidationResult = Validator.isNotEmpty(dto.recoveryCodes)
     if (recoveryCodesValidationResult.isFailed()) {
       await this.increaseLoginAttempts.execute({ email: username.value })
 
-      return Result.fail('Invalid recovery codes')
+      return Result.fail('Empty recovery codes')
     }
 
     const user = await this.userRepository.findOneByEmail(username.value)
@@ -62,14 +62,14 @@ export class SignInWithRecoveryCodes implements UseCaseInterface<AuthResponse202
     if (!user) {
       await this.increaseLoginAttempts.execute({ email: username.value })
 
-      return Result.fail('Invalid email or password')
+      return Result.fail('Could not find user')
     }
 
     const passwordMatches = await bcrypt.compare(dto.password, user.encryptedPassword)
     if (!passwordMatches) {
       await this.increaseLoginAttempts.execute({ email: username.value })
 
-      return Result.fail('Invalid email or password')
+      return Result.fail('Invalid password')
     }
 
     const recoveryCodesSetting = await this.settingService.findSettingWithDecryptedValue({
diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAuthController.ts b/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAuthController.ts
index 2a7da0ca2..6e41f5190 100644
--- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAuthController.ts
+++ b/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAuthController.ts
@@ -264,7 +264,7 @@ export class InversifyExpressAuthController extends BaseHttpController {
   @httpPost('/recovery/login', TYPES.LockMiddleware)
   async recoveryLogin(request: Request): Promise<results.JsonResult> {
     const result = await this.authController.signInWithRecoveryCodes({
-      apiVersion: request.body.apiVersion,
+      apiVersion: request.body.api_version,
       userAgent: <string>request.headers['user-agent'],
       codeVerifier: request.body.code_verifier,
       username: request.body.username,
@@ -278,7 +278,7 @@ export class InversifyExpressAuthController extends BaseHttpController {
   @httpPost('/recovery/params')
   async recoveryParams(request: Request): Promise<results.JsonResult> {
     const result = await this.authController.recoveryKeyParams({
-      apiVersion: request.body.apiVersion,
+      apiVersion: request.body.api_version,
       username: request.body.username,
       codeChallenge: request.body.code_challenge,
       recoveryCodes: request.body.recovery_codes,