diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index c905d6ad0f..039984ec58 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -87,7 +87,7 @@ public class EntityAccount {
         json.put("host", host);
         json.put("port", port);
         json.put("user", user);
-        json.put("password", password);
+        json.put("password", "");
         json.put("auth_type", auth_type);
         json.put("primary", primary);
         json.put("synchronize", synchronize);
diff --git a/app/src/main/java/eu/faircode/email/EntityIdentity.java b/app/src/main/java/eu/faircode/email/EntityIdentity.java
index 1edc3a693e..3d14152ad6 100644
--- a/app/src/main/java/eu/faircode/email/EntityIdentity.java
+++ b/app/src/main/java/eu/faircode/email/EntityIdentity.java
@@ -81,7 +81,7 @@ public class EntityIdentity {
         json.put("port", port);
         json.put("starttls", starttls);
         json.put("user", user);
-        json.put("password", password);
+        json.put("password", "");
         json.put("auth_type", auth_type);
         json.put("primary", primary);
         json.put("synchronize", synchronize);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a6fba1188..8eb2e6ce1e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -56,7 +56,7 @@
     <string name="title_edit_folder">Edit folder</string>
 
     <string name="title_setup">Setup</string>
-    <string name="title_setup_export">Export settings</string>
+    <string name="title_setup_export">Export settings (no passwords)</string>
     <string name="title_setup_import">Import settings</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>