diff --git a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
index 0189347ed..4d5e99ab6 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
@@ -303,6 +303,13 @@ public class AccountSetupBasics extends K9Activity
     }
 
     protected void onNext() {
+        if (mClientCertificateCheckBox.isChecked()) {
+
+            // Auto-setup doesn't support client certificates.
+            onManualSetup();
+            return;
+        }
+
         String email = mEmailView.getText().toString();
         String[] emailParts = splitEmail(email);
         String domain = emailParts[1];