diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f8f35ba4..b177324cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Delta Chat Android Changelog
 
+## Unreleased
+
+* Tweak advanced section and wording of some advanced options
+
 ## v2.25.0
 2025-11
 
diff --git a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
index 3865f3605..adc744835 100644
--- a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -122,14 +122,19 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
             startActivity(new Intent(this, ProxySettingsActivity.class));
         });
 
+        boolean isConfigured = DcHelper.isConfigured(getApplicationContext());
+
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setTitle(R.string.manual_account_setup_option);
+            actionBar.setTitle(
+              isConfigured? R.string.pref_password_and_account_settings : R.string.manual_account_setup_option
+            );
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
             actionBar.setElevation(0); // TODO: use custom toolbar instead
         }
 
+        if (isConfigured) emailInput.setEnabled(false);
         emailInput.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
@@ -148,7 +153,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
         advancedIcon.setRotation(45);
         viewLogText.setOnClickListener((view) -> showLog());
 
-        boolean isConfigured = DcHelper.isConfigured(getApplicationContext());
         boolean expandAdvanced = false;
         String strVal;
         int intVal;
diff --git a/src/main/res/layout/registration_activity.xml b/src/main/res/layout/registration_activity.xml
index 6650cc2ec..a24fba97c 100644
--- a/src/main/res/layout/registration_activity.xml
+++ b/src/main/res/layout/registration_activity.xml
@@ -71,7 +71,7 @@
             app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
             app:layout_constraintStart_toStartOf="@id/guideline_root_start"
             app:layout_constraintTop_toBottomOf="@id/email"
-            app:passwordToggleEnabled="true">
+            >
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/password_text"
@@ -291,7 +291,7 @@
             app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
             app:layout_constraintStart_toStartOf="@id/guideline_root_start"
             app:layout_constraintTop_toBottomOf="@id/smtp_login"
-            app:passwordToggleEnabled="true">
+            >
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/smtp_password_text"