diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index f87766acd0..2b0bdc982e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -199,7 +199,7 @@ public class FragmentQuickSetup extends FragmentBase {
 
             @Override
             public void afterTextChanged(Editable s) {
-                if (tvCharacters == null)
+                if (tvCharacters == null || tilPassword == null)
                     return;
 
                 String password = s.toString();