diff --git a/src/com/fsck/k9/preferences/StorageImporter.java b/src/com/fsck/k9/preferences/StorageImporter.java
index d0e0504ce..ac0968f01 100644
--- a/src/com/fsck/k9/preferences/StorageImporter.java
+++ b/src/com/fsck/k9/preferences/StorageImporter.java
@@ -378,6 +378,9 @@ public class StorageImporter {
         // Write identities
         if (account.identities != null) {
             importIdentities(editor, uuid, account, overwrite, existingAccount, prefs);
+        } else if (!mergeImportedAccount) {
+            // Require accounts to at least have one identity
+            throw new InvalidSettingValueException();
         }
 
         // Write folder settings