diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java
index 43878dc830e9dd62c70ebbc6b9c85873a2025f30..cce63c3f632cec245cd33d66ad6cd36fd50b98cf 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java
@@ -43,6 +43,7 @@ import com.fsck.k9.view.ClientCertificateSpinner;
 import com.fsck.k9.view.ClientCertificateSpinner.OnClientCertificateChangedListener;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
+import org.openintents.openpgp.util.OpenPgpProviderUtil;
 import timber.log.Timber;
 
 /**
@@ -251,6 +252,7 @@ public class AccountSetupBasics extends K9Activity
         if (mAccount == null) {
             mAccount = Preferences.getPreferences(this).newAccount();
             mAccount.setChipColor(accountCreator.pickColor());
+            mAccount.setOpenPgpProvider(OpenPgpProviderUtil.getOpenPgpProviderPackage(getApplicationContext()));
         }
 
         mAccount.setSenderName(getOwnerName());
@@ -368,6 +370,7 @@ public class AccountSetupBasics extends K9Activity
         if (mAccount == null) {
             mAccount = Preferences.getPreferences(this).newAccount();
             mAccount.setChipColor(accountCreator.pickColor());
+            mAccount.setOpenPgpProvider(OpenPgpProviderUtil.getOpenPgpProviderPackage(getApplicationContext()));
         }
         mAccount.setSenderName(getOwnerName());
         mAccount.setEmail(email);
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 25f1fbcf30d2aab53a133d0cf2053944f6ad5a69..d139c1cd194fb5be0bc1ed34426cbd5245c9e7cf 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
@@ -19,6 +19,7 @@ import com.fsck.k9.mail.ServerSettings;
 import com.fsck.k9.mailstore.SpecialLocalFoldersCreator;
 import com.fsck.k9.preferences.Protocols;
 import com.fsck.k9.ui.ConnectionSettings;
+import org.openintents.openpgp.util.OpenPgpProviderUtil;
 import timber.log.Timber;
 
 
@@ -34,6 +35,7 @@ public class EeloAccountCreator {
         account.setChipColor(accountCreator.pickColor());
         account.setEmail(emailId);
         account.setName(emailId);
+        account.setOpenPgpProvider(OpenPgpProviderUtil.getOpenPgpProviderPackage(context.getApplicationContext()));
 
         ConnectionSettings connectionSettings = providersXmlDiscoveryDiscover(emailId);
         if (connectionSettings == null) {
diff --git a/plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpProviderUtil.java b/plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpProviderUtil.java
index b5e9b1e802d4fd6df64e8730c1e84b596f402114..e2b3fd729c2f2bab198957f4d5f68d12b8fb2a36 100644
--- a/plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpProviderUtil.java
+++ b/plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpProviderUtil.java
@@ -9,6 +9,8 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
+import androidx.annotation.Nullable;
+
 
 public class OpenPgpProviderUtil {
     private static final String PACKAGE_NAME_APG = "org.thialfihar.android.apg";
@@ -17,6 +19,15 @@ public class OpenPgpProviderUtil {
         DISALLOWED_PROVIDERS.add(PACKAGE_NAME_APG);
     }
 
+    @Nullable
+    public static String getOpenPgpProviderPackage(Context context) {
+        List<String> openPgpProviderPackages = getOpenPgpProviderPackages(context);
+        if (openPgpProviderPackages.size() > 0) {
+            return openPgpProviderPackages.get(0);
+        }
+        return null;
+    }
+
     public static List<String> getOpenPgpProviderPackages(Context context) {
         ArrayList<String> result = new ArrayList<>();