diff --git a/feature-account-impl/src/main/java/jp/co/soramitsu/feature_account_impl/presentation/pincode/view/DotsProgressView.kt b/feature-account-impl/src/main/java/jp/co/soramitsu/feature_account_impl/presentation/pincode/view/DotsProgressView.kt
index 6777711b68..ada2812cf0 100644
--- a/feature-account-impl/src/main/java/jp/co/soramitsu/feature_account_impl/presentation/pincode/view/DotsProgressView.kt
+++ b/feature-account-impl/src/main/java/jp/co/soramitsu/feature_account_impl/presentation/pincode/view/DotsProgressView.kt
@@ -50,7 +50,7 @@ class DotsProgressView @JvmOverloads constructor(
         for (circle in circles) {
             circle?.background = emptyDrawable
         }
-        if (currentProgress == 0) {
+        if (currentProgress == 0 || currentProgress > MAX_PROGRESS) {
             return
         }
         for (i in 0 until currentProgress) {
diff --git a/feature-account-impl/src/main/java/jp/co/soramitsu/feature_account_impl/presentation/pincode/view/PinCodeView.kt b/feature-account-impl/src/main/java/jp/co/soramitsu/feature_account_impl/presentation/pincode/view/PinCodeView.kt
index 289bac1fb0..1dd90b5690 100644
--- a/feature-account-impl/src/main/java/jp/co/soramitsu/feature_account_impl/presentation/pincode/view/PinCodeView.kt
+++ b/feature-account-impl/src/main/java/jp/co/soramitsu/feature_account_impl/presentation/pincode/view/PinCodeView.kt
@@ -88,7 +88,7 @@ class PinCodeView @JvmOverloads constructor(
     }
 
     private fun pinNumberAdded(number: String) {
-        if (inputCode.length > DotsProgressView.MAX_PROGRESS) {
+        if (inputCode.length >= DotsProgressView.MAX_PROGRESS) {
             return
         } else {
             inputCode += number