diff --git a/aconfig/settings_flag_declarations.aconfig b/aconfig/settings_flag_declarations.aconfig
index 6eb1e0236de..b57a69d9469 100644
--- a/aconfig/settings_flag_declarations.aconfig
+++ b/aconfig/settings_flag_declarations.aconfig
@@ -70,3 +70,13 @@ flag {
   description: "Flag for catalyst service"
   bug: "323791114"
 }
+
+flag {
+  name: "utils_return_user_handle_for_current_user_id"
+  namespace: "profile_experiences"
+  description: "Don't ignore the current user id when checking for existing profiles."
+  bug: "378471943"
+  metadata {
+    purpose: PURPOSE_BUGFIX
+  }
+}
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index c8011ee0fb1..636ef1c7154 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -424,7 +424,8 @@ public final class Utils extends com.android.settingslib.Utils {
         final List<UserHandle> userProfiles = userManager.getUserProfiles();
         String umUserType = getUmUserType(userType);
         for (UserHandle profile : userProfiles) {
-            if (profile.getIdentifier() == UserHandle.myUserId()) {
+            if (!com.android.settings.flags.Flags.utilsReturnUserHandleForCurrentUserId()
+                    && profile.getIdentifier() == UserHandle.myUserId()) {
                 continue;
             }
             final UserInfo userInfo = userManager.getUserInfo(profile.getIdentifier());