diff --git a/library/src/main/java/com/wultra/android/digitalonboarding/VerificationService.kt b/library/src/main/java/com/wultra/android/digitalonboarding/VerificationService.kt
index d235459..fa6d944 100644
--- a/library/src/main/java/com/wultra/android/digitalonboarding/VerificationService.kt
+++ b/library/src/main/java/com/wultra/android/digitalonboarding/VerificationService.kt
@@ -539,7 +539,7 @@ class VerificationService(
         }
     }
     /** PowerAuth instance cannot start the activation. */
-    object ActivationNotActiveException: Exception("PowerAuth instance cannot start the activation.")
+    object ActivationNotActiveException: Exception("PowerAuth instance is not in the active state.")
     /** Verification status needs to be fetched first */
     object ActivationMissingStatusException: Exception("Verification status needs to be fetched first.")
 
@@ -564,8 +564,10 @@ class VerificationService(
                     override fun onActivationStatusSucceed(status: ActivationStatus?) {
                         if (status?.state != ActivationStatus.State_Active) {
                             listener?.powerAuthActivationStatusChanged(this@VerificationService, status)
+                            markCompleted(Fail(ApiError(ActivationNotActiveException)), callback)
+                        } else {
+                            markCompleted(Fail(error), callback)
                         }
-                        markCompleted(Fail(ApiError(ActivationNotActiveException)), callback)
                     }
 
                     override fun onActivationStatusFailed(t: Throwable) {
diff --git a/library/src/main/java/com/wultra/android/digitalonboarding/networking/CustomerVerificationApi.kt b/library/src/main/java/com/wultra/android/digitalonboarding/networking/CustomerVerificationApi.kt
index d3f814c..9dbe8dd 100644
--- a/library/src/main/java/com/wultra/android/digitalonboarding/networking/CustomerVerificationApi.kt
+++ b/library/src/main/java/com/wultra/android/digitalonboarding/networking/CustomerVerificationApi.kt
@@ -55,7 +55,7 @@ internal class CustomerVerificationApi(
         private val presenceCheckEndpoint = EndpointSigned<PresenceCheckRequest, PresenceCheckResponse>("api/identity/presence-check/init", "/api/identity/presence-check/init")
         private val presenceCheckSubmitEndpoint = EndpointSigned<PresenceCheckSubmitRequest, StatusResponse>("api/identity/presence-check/submit", "/api/identity/presence-check/submit")
         private val resendOtpEndpoint = EndpointSigned<VerificationResendOtpRequest, ResendOtpResponse>("api/identity/otp/resend", "/api/identity/otp/resend")
-        private val resendVerifyEndpoint = EndpointBasic<VerifyOtpRequest, VerifyOtpResponse>("api/identity/otp/verify")
+        private val otpVerifyEndpoint = EndpointBasic<VerifyOtpRequest, VerifyOtpResponse>("api/identity/otp/verify")
     }
 
     /**
@@ -277,7 +277,7 @@ internal class CustomerVerificationApi(
     fun verifyOtp(processId: String, otp: String, listener: IApiCallResponseListener<VerifyOtpResponse>) {
         post(
             VerifyOtpRequest(processId, otp),
-            resendVerifyEndpoint,
+            otpVerifyEndpoint,
             null,
             powerAuthSDK.getEciesEncryptorForActivationScope(appContext),
             null,