diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 7dc83efdff7..aa5ec388a91 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -794,6 +794,8 @@ public class UserSettings extends SettingsPreferenceFragment
                 } else {
                     setPhotoId(pref, user);
                 }
+            } else {
+                pref.setIcon(getEncircledDefaultAvatar());
             }
         }
 
@@ -825,7 +827,7 @@ public class UserSettings extends SettingsPreferenceFragment
         if (missingIcons.size() > 0) {
             loadIconsAsync(missingIcons);
         }
-        boolean moreUsers = mUserManager.getMaxSupportedUsers() > users.size();
+        boolean moreUsers = mUserManager.canAddMoreUsers();
         mAddUser.setEnabled(moreUsers);
     }
 
@@ -841,6 +843,9 @@ public class UserSettings extends SettingsPreferenceFragment
             protected Void doInBackground(List<Integer>... values) {
                 for (int userId : values[0]) {
                     Bitmap bitmap = mUserManager.getUserIcon(userId);
+                    if (bitmap == null) {
+                        bitmap = createBitmapFromDrawable(R.drawable.ic_avatar_default_1);
+                    }
                     mUserIcons.append(userId, bitmap);
                 }
                 return null;