diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java
index 71a6ba3ee0..0dd6f4a07b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java
@@ -4,7 +4,7 @@ import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.lock.v2.KbsKeyboardType;
+import org.thoughtcrime.securesms.lock.v2.PinKeyboardType;
 import org.thoughtcrime.securesms.util.JsonUtils;
 import org.whispersystems.signalservice.api.RegistrationLockData;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
@@ -117,14 +117,14 @@ public final class KbsValues {
     }
   }
 
-  public void setKeyboardType(@NonNull KbsKeyboardType keyboardType) {
+  public void setKeyboardType(@NonNull PinKeyboardType keyboardType) {
     store.beginWrite()
          .putString(KEYBOARD_TYPE, keyboardType.getCode())
          .commit();
   }
 
   @CheckResult
-  public @NonNull KbsKeyboardType getKeyboardType() {
-    return KbsKeyboardType.fromCode(store.getString(KEYBOARD_TYPE, null));
+  public @NonNull PinKeyboardType getKeyboardType() {
+    return PinKeyboardType.fromCode(store.getString(KEYBOARD_TYPE, null));
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinFragment.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinFragment.java
index dca0c32aa2..f1a5f082ff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinFragment.java
@@ -132,15 +132,15 @@ abstract class BaseKbsPinFragment<ViewModel extends BaseKbsPinViewModel> extends
     return true;
   }
 
-  private void updateKeyboard(@NonNull KbsKeyboardType keyboard) {
-    boolean isAlphaNumeric = keyboard == KbsKeyboardType.ALPHA_NUMERIC;
+  private void updateKeyboard(@NonNull PinKeyboardType keyboard) {
+    boolean isAlphaNumeric = keyboard == PinKeyboardType.ALPHA_NUMERIC;
 
     input.setInputType(isAlphaNumeric ? InputType.TYPE_CLASS_TEXT   | InputType.TYPE_TEXT_VARIATION_PASSWORD
                                       : InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
   }
 
-  private @StringRes int resolveKeyboardToggleText(@NonNull KbsKeyboardType keyboard) {
-    if (keyboard == KbsKeyboardType.ALPHA_NUMERIC) {
+  private @StringRes int resolveKeyboardToggleText(@NonNull PinKeyboardType keyboard) {
+    if (keyboard == PinKeyboardType.ALPHA_NUMERIC) {
       return R.string.BaseKbsPinFragment__create_numeric_pin;
     } else {
       return R.string.BaseKbsPinFragment__create_alphanumeric_pin;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinViewModel.java
index e991d69b3c..4a234792ef 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinViewModel.java
@@ -1,15 +1,12 @@
 package org.thoughtcrime.securesms.lock.v2;
 
 import androidx.annotation.MainThread;
-import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
 
 interface BaseKbsPinViewModel {
   LiveData<KbsPin> getUserEntry();
 
-  LiveData<KbsKeyboardType> getKeyboard();
+  LiveData<PinKeyboardType> getKeyboard();
 
   @MainThread
   void setUserEntry(String userEntry);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java
index 18bb504f6c..ac661fed3f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java
@@ -41,7 +41,7 @@ public class ConfirmKbsPinFragment extends BaseKbsPinFragment<ConfirmKbsPinViewM
   @Override
   protected ConfirmKbsPinViewModel initializeViewModel() {
     KbsPin                         userEntry  = Preconditions.checkNotNull(args.getUserEntry());
-    KbsKeyboardType                keyboard   = args.getKeyboard();
+    PinKeyboardType                keyboard   = args.getKeyboard();
     ConfirmKbsPinRepository        repository = new ConfirmKbsPinRepository();
     ConfirmKbsPinViewModel.Factory factory    = new ConfirmKbsPinViewModel.Factory(userEntry, keyboard, repository);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinRepository.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinRepository.java
index 3c1324cd1e..fe893f9609 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinRepository.java
@@ -12,13 +12,11 @@ import org.thoughtcrime.securesms.lock.PinHashing;
 import org.thoughtcrime.securesms.lock.RegistrationLockReminders;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.megaphone.Megaphones;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 import org.whispersystems.signalservice.api.KeyBackupService;
 import org.whispersystems.signalservice.api.KeyBackupServicePinException;
 import org.whispersystems.signalservice.api.RegistrationLockData;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.kbs.HashedPin;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
@@ -29,7 +27,7 @@ final class ConfirmKbsPinRepository {
 
   private static final String TAG = Log.tag(ConfirmKbsPinRepository.class);
 
-  void setPin(@NonNull KbsPin kbsPin, @NonNull KbsKeyboardType keyboard, @NonNull Consumer<PinSetResult> resultConsumer) {
+  void setPin(@NonNull KbsPin kbsPin, @NonNull PinKeyboardType keyboard, @NonNull Consumer<PinSetResult> resultConsumer) {
 
     Context context  = ApplicationDependencies.getApplication();
     String  pinValue = kbsPin.toString();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinViewModel.java
index 7ab230585f..8a77c85f1f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinViewModel.java
@@ -16,14 +16,14 @@ final class ConfirmKbsPinViewModel extends ViewModel implements BaseKbsPinViewMo
   private final ConfirmKbsPinRepository repository;
 
   private final MutableLiveData<KbsPin>          userEntry     = new MutableLiveData<>(KbsPin.EMPTY);
-  private final MutableLiveData<KbsKeyboardType> keyboard      = new MutableLiveData<>(KbsKeyboardType.NUMERIC);
+  private final MutableLiveData<PinKeyboardType> keyboard      = new MutableLiveData<>(PinKeyboardType.NUMERIC);
   private final MutableLiveData<SaveAnimation>   saveAnimation = new MutableLiveData<>(SaveAnimation.NONE);
   private final MutableLiveData<Label>           label         = new MutableLiveData<>(Label.RE_ENTER_PIN);
 
   private final KbsPin pinToConfirm;
 
   private ConfirmKbsPinViewModel(@NonNull KbsPin pinToConfirm,
-                                 @NonNull KbsKeyboardType keyboard,
+                                 @NonNull PinKeyboardType keyboard,
                                  @NonNull ConfirmKbsPinRepository repository)
   {
     this.keyboard.setValue(keyboard);
@@ -65,7 +65,7 @@ final class ConfirmKbsPinViewModel extends ViewModel implements BaseKbsPinViewMo
   }
 
   @Override
-  public LiveData<KbsKeyboardType> getKeyboard() {
+  public LiveData<PinKeyboardType> getKeyboard() {
     return keyboard;
   }
 
@@ -109,11 +109,11 @@ final class ConfirmKbsPinViewModel extends ViewModel implements BaseKbsPinViewMo
   static final class Factory implements ViewModelProvider.Factory {
 
     private final KbsPin                  pinToConfirm;
-    private final KbsKeyboardType         keyboard;
+    private final PinKeyboardType         keyboard;
     private final ConfirmKbsPinRepository repository;
 
     Factory(@NonNull KbsPin pinToConfirm,
-            @NonNull KbsKeyboardType keyboard,
+            @NonNull PinKeyboardType keyboard,
             @NonNull ConfirmKbsPinRepository repository)
     {
       this.pinToConfirm = pinToConfirm;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateKbsPinFragment.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateKbsPinFragment.java
index 0a1d7820db..d99f4fd55b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateKbsPinFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateKbsPinFragment.java
@@ -46,7 +46,7 @@ public class CreateKbsPinFragment extends BaseKbsPinFragment<CreateKbsPinViewMod
     return viewModel;
   }
 
-  private void onConfirmPin(@NonNull KbsPin userEntry, @NonNull KbsKeyboardType keyboard) {
+  private void onConfirmPin(@NonNull KbsPin userEntry, @NonNull PinKeyboardType keyboard) {
     CreateKbsPinFragmentDirections.ActionConfirmPin action = CreateKbsPinFragmentDirections.actionConfirmPin();
 
     action.setUserEntry(userEntry);
@@ -56,8 +56,8 @@ public class CreateKbsPinFragment extends BaseKbsPinFragment<CreateKbsPinViewMod
     Navigation.findNavController(requireView()).navigate(action);
   }
 
-  private String getLabelText(@NonNull KbsKeyboardType keyboard) {
-    if (keyboard == KbsKeyboardType.ALPHA_NUMERIC) {
+  private String getLabelText(@NonNull PinKeyboardType keyboard) {
+    if (keyboard == PinKeyboardType.ALPHA_NUMERIC) {
       return getPinLengthRestrictionText(R.plurals.CreateKbsPinFragment__pin_must_be_at_least_characters);
     } else {
       return getPinLengthRestrictionText(R.plurals.CreateKbsPinFragment__pin_must_be_at_least_digits);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateKbsPinViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateKbsPinViewModel.java
index fba2d0af13..efff037341 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateKbsPinViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateKbsPinViewModel.java
@@ -5,17 +5,14 @@ import androidx.annotation.NonNull;
 import androidx.core.util.Preconditions;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.Transformations;
 import androidx.lifecycle.ViewModel;
-import androidx.lifecycle.ViewModelProvider;
 
 import org.thoughtcrime.securesms.util.SingleLiveEvent;
-import org.thoughtcrime.securesms.util.livedata.LiveDataPair;
 
 public final class CreateKbsPinViewModel extends ViewModel implements BaseKbsPinViewModel {
 
   private final MutableLiveData<KbsPin>          userEntry = new MutableLiveData<>(KbsPin.EMPTY);
-  private final MutableLiveData<KbsKeyboardType> keyboard  = new MutableLiveData<>(KbsKeyboardType.NUMERIC);
+  private final MutableLiveData<PinKeyboardType> keyboard  = new MutableLiveData<>(PinKeyboardType.NUMERIC);
   private final SingleLiveEvent<NavigationEvent> events    = new SingleLiveEvent<>();
 
   @Override
@@ -24,7 +21,7 @@ public final class CreateKbsPinViewModel extends ViewModel implements BaseKbsPin
   }
 
   @Override
-  public LiveData<KbsKeyboardType> getKeyboard() {
+  public LiveData<PinKeyboardType> getKeyboard() {
     return keyboard;
   }
 
@@ -51,9 +48,9 @@ public final class CreateKbsPinViewModel extends ViewModel implements BaseKbsPin
 
   static final class NavigationEvent {
     private final KbsPin          userEntry;
-    private final KbsKeyboardType keyboard;
+    private final PinKeyboardType keyboard;
 
-    NavigationEvent(@NonNull KbsPin userEntry, @NonNull KbsKeyboardType keyboard) {
+    NavigationEvent(@NonNull KbsPin userEntry, @NonNull PinKeyboardType keyboard) {
       this.userEntry = userEntry;
       this.keyboard  = keyboard;
     }
@@ -62,7 +59,7 @@ public final class CreateKbsPinViewModel extends ViewModel implements BaseKbsPin
       return userEntry;
     }
 
-    KbsKeyboardType getKeyboard() {
+    PinKeyboardType getKeyboard() {
       return keyboard;
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/KbsKeyboardType.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/PinKeyboardType.java
similarity index 66%
rename from app/src/main/java/org/thoughtcrime/securesms/lock/v2/KbsKeyboardType.java
rename to app/src/main/java/org/thoughtcrime/securesms/lock/v2/PinKeyboardType.java
index 7370bc243c..a2f5dd79a9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/KbsKeyboardType.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/PinKeyboardType.java
@@ -2,17 +2,17 @@ package org.thoughtcrime.securesms.lock.v2;
 
 import androidx.annotation.Nullable;
 
-public enum KbsKeyboardType {
+public enum PinKeyboardType {
   NUMERIC("numeric"),
   ALPHA_NUMERIC("alphaNumeric");
 
   private final String code;
 
-  KbsKeyboardType(String code) {
+  PinKeyboardType(String code) {
     this.code = code;
   }
 
-  KbsKeyboardType getOther() {
+  public PinKeyboardType getOther() {
     if (this == NUMERIC) return ALPHA_NUMERIC;
     else                 return NUMERIC;
   }
@@ -21,8 +21,8 @@ public enum KbsKeyboardType {
     return code;
   }
 
-  public static KbsKeyboardType fromCode(@Nullable String code) {
-    for (KbsKeyboardType type : KbsKeyboardType.values()) {
+  public static PinKeyboardType fromCode(@Nullable String code) {
+    for (PinKeyboardType type : PinKeyboardType.values()) {
       if (type.code.equals(code)) {
         return type;
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java
index 1a951f2976..dc93fb123c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.registration.fragments;
 
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -21,7 +22,7 @@ import com.dd.CircularProgressButton;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.lock.v2.KbsKeyboardType;
+import org.thoughtcrime.securesms.lock.v2.PinKeyboardType;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.registration.service.CodeVerificationRequest;
 import org.thoughtcrime.securesms.registration.service.RegistrationService;
@@ -35,6 +36,7 @@ public final class RegistrationLockFragment extends BaseRegistrationFragment {
   private static final String TAG = Log.tag(RegistrationLockFragment.class);
 
   private EditText               pinEntry;
+  private View                   forgotPin;
   private CircularProgressButton pinButton;
   private TextView               errorLabel;
   private TextView               keyboardToggle;
@@ -55,12 +57,12 @@ public final class RegistrationLockFragment extends BaseRegistrationFragment {
     pinButton      = view.findViewById(R.id.kbs_lock_pin_confirm);
     errorLabel     = view.findViewById(R.id.kbs_lock_pin_input_label);
     keyboardToggle = view.findViewById(R.id.kbs_lock_keyboard_toggle);
-
-    View pinForgotButton = view.findViewById(R.id.kbs_lock_forgot_pin);
+    forgotPin      = view.findViewById(R.id.kbs_lock_forgot_pin);
 
     timeRemaining = RegistrationLockFragmentArgs.fromBundle(requireArguments()).getTimeRemaining();
 
-    pinForgotButton.setOnClickListener(v -> handleForgottenPin(timeRemaining));
+    forgotPin.setVisibility(View.GONE);
+    forgotPin.setOnClickListener(v -> handleForgottenPin(timeRemaining));
 
     pinEntry.setImeOptions(EditorInfo.IME_ACTION_DONE);
     pinEntry.setOnEditorActionListener((v, actionId, event) -> {
@@ -78,20 +80,50 @@ public final class RegistrationLockFragment extends BaseRegistrationFragment {
     });
 
     keyboardToggle.setOnClickListener((v) -> {
-      KbsKeyboardType keyboardType = getPinEntryKeyboardType();
+      PinKeyboardType keyboardType = getPinEntryKeyboardType();
 
-      updateKeyboard(keyboardType);
+      updateKeyboard(keyboardType.getOther());
       keyboardToggle.setText(resolveKeyboardToggleText(keyboardType));
     });
 
+    PinKeyboardType keyboardType = getPinEntryKeyboardType().getOther();
+    keyboardToggle.setText(resolveKeyboardToggleText(keyboardType));
+
     getModel().getTimeRemaining()
               .observe(getViewLifecycleOwner(), t -> timeRemaining = t);
+
+    TokenResponse keyBackupCurrentToken = getModel().getKeyBackupCurrentToken();
+
+    if (keyBackupCurrentToken != null) {
+      int triesRemaining = keyBackupCurrentToken.getTries();
+      if (triesRemaining <= 3) {
+        int daysRemaining = getLockoutDays(timeRemaining);
+
+        new AlertDialog.Builder(requireContext())
+                       .setTitle(R.string.RegistrationLockFragment__not_many_tries_left)
+                       .setMessage(getTriesRemainingDialogMessage(triesRemaining, daysRemaining))
+                       .setPositiveButton(android.R.string.ok, null)
+                       .show();
+      }
+
+      if (triesRemaining < 5) {
+        errorLabel.setText(requireContext().getResources().getQuantityString(R.plurals.RegistrationLockFragment__d_attempts_remaining, triesRemaining, triesRemaining));
+      }
+    }
   }
 
-  private KbsKeyboardType getPinEntryKeyboardType() {
-    boolean isNumeric = (pinEntry.getImeOptions() & InputType.TYPE_MASK_CLASS) == InputType.TYPE_CLASS_NUMBER;
+  private String getTriesRemainingDialogMessage(int triesRemaining, int daysRemaining) {
+    Resources resources = requireContext().getResources();
+    String tries        = resources.getQuantityString(R.plurals.RegistrationLockFragment__you_have_d_attempts_remaining, triesRemaining, triesRemaining);
+    String days         = resources.getQuantityString(R.plurals.RegistrationLockFragment__if_you_run_out_of_attempts_your_account_will_be_locked_for_d_days, daysRemaining, daysRemaining);
 
-    return isNumeric ? KbsKeyboardType.NUMERIC : KbsKeyboardType.ALPHA_NUMERIC;
+    return tries + " " + days;
+  }
+
+  private PinKeyboardType getPinEntryKeyboardType() {
+    boolean isNumeric = (pinEntry.getInputType() & InputType.TYPE_MASK_CLASS) == InputType.TYPE_CLASS_NUMBER;
+
+    return isNumeric ? PinKeyboardType.NUMERIC : PinKeyboardType.ALPHA_NUMERIC;
   }
 
   private void handlePinEntry() {
@@ -133,7 +165,7 @@ public final class RegistrationLockFragment extends BaseRegistrationFragment {
           cancelSpinning(pinButton);
           pinEntry.getText().clear();
 
-          errorLabel.setText(R.string.KbsLockFragment__incorrect_pin);
+          errorLabel.setText(R.string.RegistrationLockFragment__incorrect_pin);
         }
 
         @Override
@@ -157,19 +189,20 @@ public final class RegistrationLockFragment extends BaseRegistrationFragment {
           }
 
           if (triesRemaining == 3) {
-            long daysRemaining = getLockoutDays(timeRemaining);
+            int daysRemaining = getLockoutDays(timeRemaining);
 
             new AlertDialog.Builder(requireContext())
-                           .setTitle(R.string.KbsLockFragment__incorrect_pin)
-                           .setMessage(getString(R.string.KbsLockFragment__you_have_d_attempts_remaining, triesRemaining, daysRemaining, daysRemaining))
+                           .setTitle(R.string.RegistrationLockFragment__incorrect_pin)
+                           .setMessage(getTriesRemainingDialogMessage(triesRemaining, daysRemaining))
                            .setPositiveButton(android.R.string.ok, null)
                            .show();
           }
 
           if (triesRemaining > 5) {
-            errorLabel.setText(R.string.KbsLockFragment__incorrect_pin_try_again);
+            errorLabel.setText(R.string.RegistrationLockFragment__incorrect_pin_try_again);
           } else {
-            errorLabel.setText(getString(R.string.KbsLockFragment__incorrect_pin_d_attempts_remaining, triesRemaining));
+            errorLabel.setText(requireContext().getResources().getQuantityString(R.plurals.RegistrationLockFragment__incorrect_pin_d_attempts_remaining, triesRemaining, triesRemaining));
+            forgotPin.setVisibility(View.VISIBLE);
           }
         }
 
@@ -201,15 +234,16 @@ public final class RegistrationLockFragment extends BaseRegistrationFragment {
   }
 
   private void handleForgottenPin(long timeRemainingMs) {
+    int lockoutDays = getLockoutDays(timeRemainingMs);
     new AlertDialog.Builder(requireContext())
-                   .setTitle(R.string.KbsLockFragment__forgot_your_pin)
-                   .setMessage(getString(R.string.KbsLockFragment__for_your_privacy_and_security_there_is_no_way_to_recover, getLockoutDays(timeRemainingMs)))
+                   .setTitle(R.string.RegistrationLockFragment__forgot_your_pin)
+                   .setMessage(requireContext().getResources().getQuantityString(R.plurals.RegistrationLockFragment__for_your_privacy_and_security_there_is_no_way_to_recover, lockoutDays, lockoutDays))
                    .setPositiveButton(android.R.string.ok, null)
                    .show();
   }
 
-  private static long getLockoutDays(long timeRemainingMs) {
-    return TimeUnit.MILLISECONDS.toDays(timeRemainingMs) + 1;
+  private static int getLockoutDays(long timeRemainingMs) {
+    return (int) TimeUnit.MILLISECONDS.toDays(timeRemainingMs) + 1;
   }
 
   private void lockAccount(long timeRemaining) {
@@ -218,18 +252,18 @@ public final class RegistrationLockFragment extends BaseRegistrationFragment {
     Navigation.findNavController(requireView()).navigate(action);
   }
 
-  private void updateKeyboard(@NonNull KbsKeyboardType keyboard) {
-    boolean isAlphaNumeric = keyboard == KbsKeyboardType.ALPHA_NUMERIC;
+  private void updateKeyboard(@NonNull PinKeyboardType keyboard) {
+    boolean isAlphaNumeric = keyboard == PinKeyboardType.ALPHA_NUMERIC;
 
     pinEntry.setInputType(isAlphaNumeric ? InputType.TYPE_CLASS_TEXT   | InputType.TYPE_TEXT_VARIATION_PASSWORD
                                          : InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
   }
 
-  private @StringRes static int resolveKeyboardToggleText(@NonNull KbsKeyboardType keyboard) {
-    if (keyboard == KbsKeyboardType.ALPHA_NUMERIC) {
-      return R.string.KbsLockFragment__enter_alphanumeric_pin;
+  private @StringRes static int resolveKeyboardToggleText(@NonNull PinKeyboardType keyboard) {
+    if (keyboard == PinKeyboardType.ALPHA_NUMERIC) {
+      return R.string.RegistrationLockFragment__enter_alphanumeric_pin;
     } else {
-      return R.string.KbsLockFragment__enter_numeric_pin;
+      return R.string.RegistrationLockFragment__enter_numeric_pin;
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index 7eec21b5e9..95eacd4988 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -17,7 +17,6 @@ import org.greenrobot.eventbus.EventBus;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.jobmanager.impl.SqlCipherMigrationConstraintObserver;
 import org.thoughtcrime.securesms.lock.RegistrationLockReminders;
-import org.thoughtcrime.securesms.lock.v2.KbsKeyboardType;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference;
 import org.thoughtcrime.securesms.profiles.ProfileName;
diff --git a/app/src/main/res/layout/fragment_registration_lock.xml b/app/src/main/res/layout/fragment_registration_lock.xml
index bce57fd272..dc3a5553b3 100644
--- a/app/src/main/res/layout/fragment_registration_lock.xml
+++ b/app/src/main/res/layout/fragment_registration_lock.xml
@@ -1,95 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fillViewport="true">
 
-    <TextView
-        android:id="@+id/kbs_lock_pin_title"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:text="@string/KbsLockFragment__enter_your_pin"
-        android:textAppearance="@style/TextAppearance.Signal.Title1"
-        app:layout_constraintBottom_toTopOf="@id/kbs_lock_keyboard_toggle"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.20" />
+        android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/kbs_lock_pin_description"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="27dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="27dp"
-        android:gravity="center_horizontal"
-        android:minHeight="66dp"
-        android:text="@string/KbsLockFragment__enter_the_pin_you_created"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-        android:textColor="@color/core_grey_60"
-        app:layout_constraintTop_toBottomOf="@id/kbs_lock_pin_title" />
+        <TextView
+            android:id="@+id/kbs_lock_pin_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/RegistrationLockFragment__enter_your_pin"
+            android:textAppearance="@style/TextAppearance.Signal.Title1"
+            app:layout_constraintBottom_toTopOf="@id/kbs_lock_keyboard_toggle"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.20" />
 
-    <EditText
-        android:id="@+id/kbs_lock_pin_input"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="12dp"
-        android:gravity="center_horizontal"
-        android:inputType="numberPassword"
-        android:minWidth="210dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/kbs_lock_pin_description" />
+        <TextView
+            android:id="@+id/kbs_lock_pin_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="27dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="27dp"
+            android:gravity="center_horizontal"
+            android:minHeight="66dp"
+            android:text="@string/RegistrationLockFragment__enter_the_pin_you_created"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+            android:textColor="@color/core_grey_60"
+            app:layout_constraintTop_toBottomOf="@id/kbs_lock_pin_title" />
 
-    <TextView
-        android:id="@+id/kbs_lock_pin_input_label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:gravity="center_horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/kbs_lock_pin_input"
-        tools:text="@string/KbsLockFragment__incorrect_pin_try_again" />
+        <EditText
+            android:id="@+id/kbs_lock_pin_input"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="12dp"
+            android:gravity="center_horizontal"
+            android:inputType="numberPassword"
+            android:minWidth="210dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/kbs_lock_pin_description" />
 
-    <Button
-        android:id="@+id/kbs_lock_forgot_pin"
-        style="@style/Widget.AppCompat.Button.Borderless.Colored"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="32dp"
-        android:text="@string/KbsLockFragment__forgot_pin"
-        android:textColor="@color/signal_primary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/kbs_lock_pin_input" />
+        <TextView
+            android:id="@+id/kbs_lock_pin_input_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:gravity="center_horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/kbs_lock_pin_input"
+            tools:text="@string/RegistrationLockFragment__incorrect_pin_try_again" />
 
-    <Button
-        android:id="@+id/kbs_lock_keyboard_toggle"
-        style="@style/Widget.AppCompat.Button.Borderless.Colored"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:textColor="@color/signal_primary"
-        app:layout_constraintBottom_toTopOf="@id/kbs_lock_pin_confirm"
-        tools:text="Create Alphanumeric Pin" />
+        <Button
+            android:id="@+id/kbs_lock_forgot_pin"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:text="@string/RegistrationLockFragment__forgot_pin"
+            android:textColor="@color/signal_primary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/kbs_lock_pin_input_label" />
 
-    <com.dd.CircularProgressButton
-        android:id="@+id/kbs_lock_pin_confirm"
-        style="@style/Button.Registration"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:layout_marginBottom="16dp"
-        app:cpb_textIdle="@string/RegistrationActivity_continue"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        <Button
+            android:id="@+id/kbs_lock_keyboard_toggle"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:textColor="@color/signal_primary"
+            app:layout_constraintBottom_toTopOf="@id/kbs_lock_pin_confirm"
+            app:layout_constraintTop_toBottomOf="@id/kbs_lock_forgot_pin"
+            app:layout_constraintVertical_bias="1.0"
+            tools:text="Create Alphanumeric Pin" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <com.dd.CircularProgressButton
+            android:id="@+id/kbs_lock_pin_confirm"
+            style="@style/Button.Registration"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginBottom="16dp"
+            app:cpb_textIdle="@string/RegistrationActivity_continue"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/create_kbs_pin.xml b/app/src/main/res/navigation/create_kbs_pin.xml
index c9cf5f0848..065d487cea 100644
--- a/app/src/main/res/navigation/create_kbs_pin.xml
+++ b/app/src/main/res/navigation/create_kbs_pin.xml
@@ -46,7 +46,7 @@
         <argument
             android:name="keyboard"
             android:defaultValue="NUMERIC"
-            app:argType="org.thoughtcrime.securesms.lock.v2.KbsKeyboardType"
+            app:argType="org.thoughtcrime.securesms.lock.v2.PinKeyboardType"
             app:nullable="false" />
 
     </fragment>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4dfcb66986..24e4fc9381 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1735,18 +1735,41 @@
     <string name="AccountLockedFragment__learn_more_url">https://signal.org/blog/secure-value-recovery/</string>
 
     <!-- KbsLockFragment -->
-    <string name="KbsLockFragment__enter_your_pin">Enter your PIN</string>
-    <string name="KbsLockFragment__enter_the_pin_you_created">Enter the PIN you created for your account. This is different from your SMS verification code.</string>
-    <string name="KbsLockFragment__enter_alphanumeric_pin">Enter alphanumeric PIN</string>
-    <string name="KbsLockFragment__enter_numeric_pin">Enter numeric PIN</string>
-    <string name="KbsLockFragment__next">Next</string>
-    <string name="KbsLockFragment__incorrect_pin_try_again">Incorrect PIN. Try again.</string>
-    <string name="KbsLockFragment__incorrect_pin_d_attempts_remaining">Incorrect PIN. %1$d attempts remaining.</string>
-    <string name="KbsLockFragment__forgot_pin">Forgot PIN?</string>
-    <string name="KbsLockFragment__incorrect_pin">Incorrect PIN</string>
-    <string name="KbsLockFragment__you_have_d_attempts_remaining">You have %1$d attempts remaining. If you run out of attempts your account will be locked for %2$d days. After %3$d days of inactivity, you can re-register without your PIN. Your account will be wiped and all content deleted.</string>
-    <string name="KbsLockFragment__forgot_your_pin">Forgot your PIN?</string>
-    <string name="KbsLockFragment__for_your_privacy_and_security_there_is_no_way_to_recover">For your privacy and security, there is no way to recover your PIN. If you can\'t remember your PIN, you can re-verify with SMS after %1$d days of inactivity. In this case, your account will be wiped and all content deleted.</string>
+    <string name="RegistrationLockFragment__enter_your_pin">Enter your PIN</string>
+    <string name="RegistrationLockFragment__enter_the_pin_you_created">Enter the PIN you created for your account. This is different from your SMS verification code.</string>
+    <string name="RegistrationLockFragment__enter_alphanumeric_pin">Enter alphanumeric PIN</string>
+    <string name="RegistrationLockFragment__enter_numeric_pin">Enter numeric PIN</string>
+    <string name="RegistrationLockFragment__next">Next</string>
+    <string name="RegistrationLockFragment__incorrect_pin_try_again">Incorrect PIN. Try again.</string>
+    <string name="RegistrationLockFragment__forgot_pin">Forgot PIN?</string>
+    <string name="RegistrationLockFragment__incorrect_pin">Incorrect PIN</string>
+    <string name="RegistrationLockFragment__forgot_your_pin">Forgot your PIN?</string>
+    <string name="RegistrationLockFragment__not_many_tries_left">Not many tries left!</string>
+
+    <plurals name="RegistrationLockFragment__for_your_privacy_and_security_there_is_no_way_to_recover">
+        <item quantity="one">For your privacy and security, there is no way to recover your PIN. If you can\'t remember your PIN, you can re-verify with SMS after %1$d day of inactivity. In this case, your account will be wiped and all content deleted.</item>
+        <item quantity="other">For your privacy and security, there is no way to recover your PIN. If you can\'t remember your PIN, you can re-verify with SMS after %1$d days of inactivity. In this case, your account will be wiped and all content deleted.</item>
+    </plurals>
+
+    <plurals name="RegistrationLockFragment__incorrect_pin_d_attempts_remaining">
+        <item quantity="one">Incorrect PIN. %1$d attempt remaining.</item>
+        <item quantity="other">Incorrect PIN. %1$d attempts remaining.</item>
+    </plurals>
+
+    <plurals name="RegistrationLockFragment__if_you_run_out_of_attempts_your_account_will_be_locked_for_d_days">
+        <item quantity="one">If you run out of attempts your account will be locked for %1$d day. After %1$d day of inactivity, you can re-register without your PIN. Your account will be wiped and all content deleted.</item>
+        <item quantity="other">If you run out of attempts your account will be locked for %1$d days. After %1$d days of inactivity, you can re-register without your PIN. Your account will be wiped and all content deleted.</item>
+    </plurals>
+
+    <plurals name="RegistrationLockFragment__you_have_d_attempts_remaining">
+        <item quantity="one">You have %1$d attempt remaining.</item>
+        <item quantity="other">You have %1$d attempts remaining.</item>
+    </plurals>
+
+    <plurals name="RegistrationLockFragment__d_attempts_remaining">
+        <item quantity="one">%1$d attempt remaining.</item>
+        <item quantity="other">%1$d attempts remaining.</item>
+    </plurals>
 
     <!-- KBS Megaphone -->
     <string name="KbsMegaphone__create_a_pin">Create a PIN</string>