diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8622d1050..ce4780ad2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -26,7 +26,9 @@
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
+    <!-- Needed to get the owner name which is used when the first mail account is created -->
+    <uses-permission android:name="android.permission.READ_OWNER_DATA"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
     <uses-permission android:name="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" />
 
     <permission android:name="com.fsck.k9.permission.READ_ATTACHMENT"
diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index 0ee36baf5..c029b899b 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -133,19 +133,12 @@ public class Account implements BaseAccount {
         // decide on owners name
         String name = "";
         try {
-            name = Contacts.getInstance(context).getOwnerName();
-        } catch (Exception e) {
-            Log.e(K9.LOG_TAG, "Could not get owner name, using default account name", e);
-        }
-        if (name == null || name.length() == 0) {
-            try {
-                Account account = Preferences.getPreferences(context).getDefaultAccount();
-                if (account != null) {
-                    name = account.getName();
-                }
-            } catch (Exception e) {
-                Log.e(K9.LOG_TAG, "Could not get default account name", e);
+            Account account = Preferences.getPreferences(context).getDefaultAccount();
+            if (account != null) {
+                name = account.getName();
             }
+        } catch (Exception e) {
+            Log.e(K9.LOG_TAG, "Could not get default account name", e);
         }
         if (name == null) {
             name = "";
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
index 02b18f1fc..a0b9c6b93 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
@@ -140,7 +140,7 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList
 	                            setMessage(R.string.account_setup_check_settings_fetch);
 	                        }
 	                        MessagingController.getInstance(getApplication()).listFoldersSynchronous(mAccount, true, null);
-	                        MessagingController.getInstance(getApplication()).synchronizeMailbox(mAccount, K9.INBOX , null, null);
+	                        MessagingController.getInstance(getApplication()).synchronizeMailbox(mAccount, mAccount.getInboxFolderName() , null, null);
 	                    }
 	                    if (mDestroyed) {
 	                        return;