diff --git a/res/layout/account_setup_basics.xml b/res/layout/account_setup_basics.xml
index c134e90dd..50f6c4d67 100644
--- a/res/layout/account_setup_basics.xml
+++ b/res/layout/account_setup_basics.xml
@@ -35,13 +35,6 @@
         android:layout_width="fill_parent"
         android:nextFocusDown="@+id/next"
         />
-    <CheckBox
-        android:id="@+id/account_default"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:text="@string/account_setup_basics_default_label"
-        android:visibility="gone"
-        />
     <View
         android:layout_width="fill_parent"
         android:layout_height="0dip"
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
index dea801ed1..acafbf8fe 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
@@ -26,8 +26,7 @@ import java.net.URISyntaxException;
 import java.net.URLEncoder;
 
 /**
- * Prompts the user for the email address and password. Also prompts for
- * "Use this account as default" if this is the 2nd+ account being set up.
+ * Prompts the user for the email address and password.
  * Attempts to lookup default settings for the domain the user specified. If the
  * domain is known the settings are handed off to the AccountSetupCheckSettings
  * activity. If no settings are found the settings are handed off to the
@@ -43,7 +42,6 @@ public class AccountSetupBasics extends K9Activity
     private Preferences mPrefs;
     private EditText mEmailView;
     private EditText mPasswordView;
-    private CheckBox mDefaultView;
     private Button mNextButton;
     private Button mManualSetupButton;
     private Account mAccount;
@@ -63,7 +61,6 @@ public class AccountSetupBasics extends K9Activity
         mPrefs = Preferences.getPreferences(this);
         mEmailView = (EditText)findViewById(R.id.account_email);
         mPasswordView = (EditText)findViewById(R.id.account_password);
-        mDefaultView = (CheckBox)findViewById(R.id.account_default);
         mNextButton = (Button)findViewById(R.id.next);
         mManualSetupButton = (Button)findViewById(R.id.manual_setup);
 
@@ -73,10 +70,6 @@ public class AccountSetupBasics extends K9Activity
         mEmailView.addTextChangedListener(this);
         mPasswordView.addTextChangedListener(this);
 
-        if (mPrefs.getAccounts().length > 0) {
-            mDefaultView.setVisibility(View.VISIBLE);
-        }
-
         if (savedInstanceState != null && savedInstanceState.containsKey(EXTRA_ACCOUNT)) {
             String accountUuid = savedInstanceState.getString(EXTRA_ACCOUNT);
             mAccount = Preferences.getPreferences(this).getAccount(accountUuid);
@@ -276,9 +269,6 @@ public class AccountSetupBasics extends K9Activity
         if (resultCode == RESULT_OK) {
             mAccount.setDescription(mAccount.getEmail());
             mAccount.save(Preferences.getPreferences(this));
-            if (mDefaultView.isChecked()) {
-                Preferences.getPreferences(this).setDefaultAccount(mAccount);
-            }
             K9.setServicesEnabled(this);
             AccountSetupNames.actionSetNames(this, mAccount);
             finish();
@@ -323,7 +313,8 @@ public class AccountSetupBasics extends K9Activity
             mAccount.setSpamFolderName(getString(R.string.special_mailbox_name_spam));
         }
 
-        AccountSetupAccountType.actionSelectAccountType(this, mAccount, mDefaultView.isChecked());
+        AccountSetupAccountType.actionSelectAccountType(this, mAccount, false);
+
         finish();
     }