diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 4481981ad..908c29d21 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -503,7 +503,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		} else {
 			if (this.mAccount.errorStatus()) {
 				this.mAccountJid.setError(getString(this.mAccount.getStatus().getReadableId()));
-				if (init) {
+				if (init || !accountInfoEdited()) {
 					this.mAccountJid.requestFocus();
 				}
 			} else {