diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1828a03d1..24e12c826 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -123,6 +123,10 @@
             android:name=".activity.setup.AccountSettings"
             android:label="@string/account_settings_action"
             >
+            <intent-filter>
+                <action android:name="com.android.email.activity.setup.ACCOUNT_MANAGER_ENTRY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".activity.setup.AccountSecurity"
diff --git a/res/xml/account_preferences.xml b/res/xml/account_preferences.xml
index 67d8ff6ad..9be25fdec 100644
--- a/res/xml/account_preferences.xml
+++ b/res/xml/account_preferences.xml
@@ -27,8 +27,7 @@
         android:summary="@string/account_settings_exchange_summary">
         <intent
             android:action="com.android.email.activity.setup.ACCOUNT_MANAGER_ENTRY"
-            android:targetPackage="com.android.email"
-            android:targetClass="com.android.email.activity.setup.AccountSettings" />
+            />
     </PreferenceScreen>
 
 </PreferenceScreen>