diff --git a/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt b/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt
index 08bc5bbefc060b85c70cfa54055c5990636febae..b7cd41f00f41cbf80468de41e19e1c4512a8c13a 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt
+++ b/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt
@@ -325,7 +325,11 @@ class SettingsExporter(
         val suffix = ".$identity"
 
         // Write name belonging to the identity
-        val name = prefs[prefix + IDENTITY_NAME_KEY + suffix] as String?
+        var name = prefs[prefix + IDENTITY_NAME_KEY + suffix] as String?
+        if (name == null) {
+           name = prefs[prefix + IDENTITY_EMAIL_KEY + suffix] as String?
+        }
+
         serializer.startTag(null, NAME_ELEMENT)
         serializer.text(name)
         serializer.endTag(null, NAME_ELEMENT)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/accountmanager/EeloAccountCreator.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/accountmanager/EeloAccountCreator.java
index 780f92a17d84d7c756c3f8eec840c28579ad3f96..e210ee0f1fec6991177e0a8a3aa15ff7853384b8 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/accountmanager/EeloAccountCreator.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/accountmanager/EeloAccountCreator.java
@@ -141,6 +141,7 @@ public class EeloAccountCreator {
         account.setChipColor(accountCreator.pickColor());
         account.setEmail(emailId);
         account.setName(emailId);
+        account.setSenderName(emailId);
 
         ConnectionSettings connectionSettings = providersXmlDiscoveryDiscover(emailId);
         if (connectionSettings == null) {