diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6bb7069d4..a231c3e08 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -27,7 +27,9 @@
     <uses-permission android:name="com.fsck.k9.permission.READ_ATTACHMENT"/>
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:name="K9"
         >
-        <activity android:name="com.fsck.k9.activity.Welcome">
+        <activity
+            android:name="com.fsck.k9.activity.Accounts"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -122,10 +124,6 @@
             android:name="com.fsck.k9.activity.Debug"
             android:label="@string/debug_title">
         </activity>
-        <activity
-            android:name="com.fsck.k9.activity.Accounts"
-            android:label="@string/accounts_title">
-        </activity>
         <activity
             android:name="com.fsck.k9.activity.FolderList">
             <!--
diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index a99542f88..19edcff29 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -252,7 +252,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
 
         Account[] accounts = Preferences.getPreferences(this).getAccounts();
         Intent intent = getIntent();
-        boolean startup = (boolean)intent.getBooleanExtra(EXTRA_STARTUP, false);
+        boolean startup = (boolean)intent.getBooleanExtra(EXTRA_STARTUP, true);
         if (startup && accounts.length == 1)
         {
             onOpenAccount(accounts[0], true);
diff --git a/src/com/fsck/k9/activity/Welcome.java b/src/com/fsck/k9/activity/Welcome.java
deleted file mode 100644
index b0d7632db..000000000
--- a/src/com/fsck/k9/activity/Welcome.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.fsck.k9.activity;
-
-import android.os.Bundle;
-import com.fsck.k9.K9Activity;
-
-/**
- * The Welcome activity initializes the application and decides what Activity
- * the user should start with.
- * If no accounts are configured the user is taken to the Accounts Activity where they
- * can configure an account.
- * If a single account is configured the user is taken directly to the MessageList for
- * the INBOX of that account.
- * If more than one account is configuref the user is takaen to the Accounts Activity so they
- * can select an account.
- */
-public class Welcome extends K9Activity
-{
-    @Override
-    public void onCreate(Bundle icicle)
-    {
-        super.onCreate(icicle);
-
-        Accounts.actionLaunch(this);
-        finish();
-    }
-}