1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
index 28224501d..634443165 100644
--- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
@@ -878,6 +878,8 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
             } else {
                 this.mAccountJid.getEditableText().append(this.mAccount.getJid().toBareJid().toString());
             }
+            this.mPassword.getEditableText().clear();
+            this.mPassword.getEditableText().append(this.mAccount.getPassword());
             this.mPassword.setText(this.mAccount.getPassword());
             this.mHostname.setText("");
             this.mHostname.getEditableText().append(this.mAccount.getHostname());
@@ -887,6 +889,11 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
 
         }
 
+        final boolean editable = !mAccount.isOptionSet(Account.OPTION_LOGGED_IN_SUCCESSFULLY);
+        this.mAccountJid.setEnabled(editable);
+        this.mAccountJid.setFocusable(editable);
+        this.mAccountJid.setFocusableInTouchMode(editable);
+
         if (!mInitMode) {
             this.mAvatar.setVisibility(View.VISIBLE);
             this.mAvatar.setImageBitmap(avatarService().get(this.mAccount, getPixel(Config.AVATAR_SIZE)));