diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 085d9635ee..74dbfb8daf 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -379,18 +379,10 @@ public class FragmentIdentity extends FragmentBase {
             }
         });
 
-        etDomain.addTextChangedListener(new TextWatcher() {
+        btnAutoConfig.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence text, int start, int before, int count) {
-            }
-
-            @Override
-            public void afterTextChanged(Editable editable) {
-                btnAutoConfig.setEnabled(editable.length() > 0);
+            public void onClick(View v) {
+                onAutoConfig();
             }
         });