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 a58fdcd9e..d51ba5fd5 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
@@ -39,8 +39,11 @@ public class CreateKbsPinFragment extends BaseKbsPinFragment<CreateKbsPinViewMod
   protected CreateKbsPinViewModel initializeViewModel() {
     CreateKbsPinViewModel viewModel = ViewModelProviders.of(this).get(CreateKbsPinViewModel.class);
 
-    viewModel.getKeyboard().observe(getViewLifecycleOwner(), k -> getLabel().setText(getLabelText(k)));
     viewModel.getNavigationEvents().observe(getViewLifecycleOwner(), e -> onConfirmPin(e.getUserEntry(), e.getKeyboard()));
+    viewModel.getKeyboard().observe(getViewLifecycleOwner(), k -> {
+      getLabel().setText(getLabelText(k));
+      getInput().getText().clear();
+    });
 
     return viewModel;
   }
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 dc93fb123..73fb7a878 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
@@ -257,6 +257,8 @@ public final class RegistrationLockFragment extends BaseRegistrationFragment {
 
     pinEntry.setInputType(isAlphaNumeric ? InputType.TYPE_CLASS_TEXT   | InputType.TYPE_TEXT_VARIATION_PASSWORD
                                          : InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
+
+    pinEntry.getText().clear();
   }
 
   private @StringRes static int resolveKeyboardToggleText(@NonNull PinKeyboardType keyboard) {