diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index c2b76e19f54..434fe154fb6 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -180,7 +180,9 @@ public class ChooseLockGeneric extends SettingsActivity {
                     !mLockPatternUtils.isSeparateProfileChallengeAllowed(targetUser)) {
                 // Always use parent if explicitely requested or if profile challenge is not
                 // supported
-                mUserId = Utils.getUserIdFromBundle(getContext(), getArguments());
+                Bundle arguments = getArguments();
+                mUserId = Utils.getUserIdFromBundle(getContext(), arguments != null ? arguments
+                        : getActivity().getIntent().getExtras());
             } else {
                 mUserId = targetUser;
             }