diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 306e10a370..beb1c2e48e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -231,6 +231,7 @@ public class FragmentAccount extends FragmentEx {
         btnAutoConfig.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                etDomain.setEnabled(false);
                 btnAutoConfig.setEnabled(false);
 
                 Bundle args = new Bundle();
@@ -253,6 +254,7 @@ public class FragmentAccount extends FragmentEx {
 
                     @Override
                     protected void onLoaded(Bundle args, SRVRecord srv) {
+                        etDomain.setEnabled(true);
                         btnAutoConfig.setEnabled(true);
                         if (srv != null) {
                             etHost.setText(srv.getTarget().toString(true));
@@ -262,6 +264,7 @@ public class FragmentAccount extends FragmentEx {
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
+                        etDomain.setEnabled(true);
                         btnAutoConfig.setEnabled(true);
                         if (ex instanceof IllegalArgumentException)
                             Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 045d3ce7ca..7df8afb805 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -218,6 +218,7 @@ public class FragmentIdentity extends FragmentEx {
         btnAutoConfig.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                etDomain.setEnabled(false);
                 btnAutoConfig.setEnabled(false);
 
                 Bundle args = new Bundle();
@@ -240,6 +241,7 @@ public class FragmentIdentity extends FragmentEx {
 
                     @Override
                     protected void onLoaded(Bundle args, SRVRecord srv) {
+                        etDomain.setEnabled(true);
                         btnAutoConfig.setEnabled(true);
                         if (srv != null) {
                             etHost.setText(srv.getTarget().toString(true));
@@ -250,6 +252,7 @@ public class FragmentIdentity extends FragmentEx {
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
+                        etDomain.setEnabled(true);
                         btnAutoConfig.setEnabled(true);
                         if (ex instanceof IllegalArgumentException)
                             Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();