diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index e5ba200737a..aa67b85481e 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -236,7 +236,8 @@ public class ChooseLockGeneric extends SettingsActivity {
                 boolean managedProfileWithUnifiedLock =
                         UserManager.get(getActivity()).isManagedProfile(mUserId)
                         && !mLockPatternUtils.isSeparateProfileChallengeEnabled(mUserId);
-                if (managedProfileWithUnifiedLock
+                boolean skipConfirmation = managedProfileWithUnifiedLock && !mIsSetNewPassword;
+                if (skipConfirmation
                         || !helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
                         getString(R.string.unlock_set_unlock_launch_picker_title), true, mUserId)) {
                     mPasswordConfirmed = true; // no password set, so no need to confirm