diff --git a/res/values/strings.xml b/res/values/strings.xml
index 710ee5d7cf7..90cc39c9fad 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6948,6 +6948,8 @@
     <!-- User summary to indicate that a work profile is currently not set up [CHAR LIMIT=100] -->
     <string name="user_summary_managed_profile_not_set_up">Not set up - Work profile</string>
     <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
+    <string name="user_owner">Owner</string>
+    <!-- User information string to represent the admin of the device [CHAR LIMIT=25] -->
     <string name="user_admin">Admin</string>
     <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
     <string name="user_you">You (<xliff:g id="name" example="Name">%s</xliff:g>)</string>
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 83dc1274c06..8dbb91cf506 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -368,9 +368,6 @@ public class UserSettings extends SettingsPreferenceFragment
         mMePreference = new UserPreference(getPrefContext(), null /* attrs */, myUserId);
         mMePreference.setKey(KEY_USER_ME);
         mMePreference.setOnPreferenceClickListener(this);
-        if (isCurrentUserAdmin()) {
-            mMePreference.setSummary(R.string.user_admin);
-        }
 
         mGuestCategory = findPreference(KEY_GUEST_CATEGORY);
 
@@ -1241,13 +1238,15 @@ public class UserSettings extends SettingsPreferenceFragment
                 pref.setEnabled(canOpenUserDetails);
                 pref.setSelectable(true);
                 pref.setKey("id=" + user.id);
-                if (user.isAdmin()) {
-                    pref.setSummary(R.string.user_admin);
-                }
             }
             if (pref == null) {
                 continue;
             }
+            if (user.isMain()) {
+                pref.setSummary(R.string.user_owner);
+            } else if (user.isAdmin()) {
+                pref.setSummary(R.string.user_admin);
+            }
             if (user.id != UserHandle.myUserId() && !user.isGuest() && !user.isInitialized()) {
                 // sometimes after creating a guest the initialized flag isn't immediately set
                 // and we don't want to show "Not set up" summary for them