diff --git a/src/com/android/contacts/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java
index fc41ae99b76ce59580dd8eb4a7a1659aa1ff0248..cc801bfc872ea186f1a4621421abc7ab33211793 100644
--- a/src/com/android/contacts/editor/RawContactEditorView.java
+++ b/src/com/android/contacts/editor/RawContactEditorView.java
@@ -782,7 +782,7 @@ public class RawContactEditorView extends LinearLayout implements View.OnClickLi
         }
 
         // If we're saving a new contact and there are multiple accounts, add the account selector.
-        if (mHasNewContact && !mIsUserProfile && mAccounts.size() > 1) {
+        if (mHasNewContact && mAccounts.size() > 1) {
             addAccountSelector(mCurrentRawContactDelta);
         }
     }
diff --git a/src/com/android/contacts/model/account/AccountComparator.java b/src/com/android/contacts/model/account/AccountComparator.java
index 70ccf494fb78694222497e7e2d1827d3f1e87f96..8bc8fbbf76707a9b6121630f02d3df900d1f3b9a 100644
--- a/src/com/android/contacts/model/account/AccountComparator.java
+++ b/src/com/android/contacts/model/account/AccountComparator.java
@@ -38,13 +38,13 @@ public class AccountComparator implements Comparator<AccountWithDataSet> {
             return -1;
         } else if (a.name == null || a.type == null) {
             return 1;
-        } else if (isWritableGoogleAccount(a) && a.equals(mDefaultAccount)) {
+        } else if (isWritableEAccount(a) && a.equals(mDefaultAccount)) {
             return -1;
-        } else if (isWritableGoogleAccount(b) && b.equals(mDefaultAccount)) {
+        } else if (isWritableEAccount(b) && b.equals(mDefaultAccount)) {
             return 1;
-        } else if (isWritableGoogleAccount(a) && !isWritableGoogleAccount(b)) {
+        } else if (isWritableEAccount(a) && !isWritableEAccount(b)) {
             return -1;
-        } else if (isWritableGoogleAccount(b) && !isWritableGoogleAccount(a)) {
+        } else if (isWritableEAccount(b) && !isWritableEAccount(a)) {
             return 1;
         } else {
             int diff = a.name.compareToIgnoreCase(b.name);
@@ -65,7 +65,7 @@ public class AccountComparator implements Comparator<AccountWithDataSet> {
         }
     }
 
-    private static boolean isWritableGoogleAccount(AccountWithDataSet account) {
-        return GoogleAccountType.ACCOUNT_TYPE.equals(account.type) && account.dataSet == null;
+    private static boolean isWritableEAccount(AccountWithDataSet account) {
+        return "foundation.e.accountmanager.eelo.address_book".equals(account.type) && account.dataSet == null;
     }
 }