diff --git a/res/values/strings.xml b/res/values/strings.xml
index 14eafbadb10..f695be50ebf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1339,9 +1339,9 @@
     <!-- Label for button to retry creating private space again on creation error. [CHAR LIMIT=30] -->
     <string name="private_space_tryagain_label">Try Again</string>
     <!-- Title for private space lock setup screen. [CHAR LIMIT=90] -->
-    <string name="private_space_lockscreen_title">Use screen lock to unlock private space?</string>
+    <string name="private_space_lockscreen_title">Choose a new lock for private space?</string>
     <!-- Summary for the private space lock setup screen. [CHAR LIMIT=NONE] -->
-    <string name="private_space_lockscreen_summary">You can unlock your private space the same way you unlock your device, or choose a different lock</string>
+    <string name="private_space_lockscreen_summary">You can set a new lock just for private space, or use the same lock you use to unlock your device</string>
     <!-- Action label to use existing device lock for private space. [CHAR LIMIT=50] -->
     <string name="private_space_use_screenlock_label">Use screen lock</string>
     <!-- Label for private space lock setup button to choose a new lock. [CHAR LIMIT=50] -->
diff --git a/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java b/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
index 286f860ba52..830b45e2796 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
@@ -63,16 +63,16 @@ public class PrivateSpaceSetLockFragment extends InstrumentedFragment {
         final FooterBarMixin mixin = rootView.getMixin(FooterBarMixin.class);
         mixin.setPrimaryButton(
                 new FooterButton.Builder(getContext())
-                        .setText(R.string.private_space_use_screenlock_label)
-                        .setListener(onClickUse())
+                        .setText(R.string.private_space_set_lock_label)
+                        .setListener(onClickNewLock())
                         .setButtonType(FooterButton.ButtonType.NEXT)
                         .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
                         .build());
         mixin.setSecondaryButton(
                 new FooterButton.Builder(getContext())
-                        .setText(R.string.private_space_set_lock_label)
-                        .setListener(onClickNewLock())
-                        .setButtonType(FooterButton.ButtonType.NEXT)
+                        .setText(R.string.private_space_use_screenlock_label)
+                        .setListener(onClickUse())
+                        .setButtonType(FooterButton.ButtonType.SKIP)
                         .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
                         .build());
         OnBackPressedCallback callback =