diff --git a/res/layout/setup_choose_lock_generic.xml b/res/layout/setup_choose_lock_generic.xml
index 3b3b5e786bb..325844b92f6 100644
--- a/res/layout/setup_choose_lock_generic.xml
+++ b/res/layout/setup_choose_lock_generic.xml
@@ -21,6 +21,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     settings:suwBackgroundTile="@drawable/setup_illustration_tile"
-    settings:suwHeaderText="@string/wifi_setup_wizard_title"
+    settings:suwHeaderText="@string/setup_lock_settings_picker_title"
     settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
     settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4187638192f..da3b92a5cc1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -940,6 +940,9 @@
     <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
     <string name="lock_settings_picker_title">Choose screen lock</string>
 
+    <!-- Title for screen in setup wizard, prompting user to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=40] -->
+    <string name="setup_lock_settings_picker_title">Choose screen lock</string>
+
     <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
     <string name="lock_settings_picker_fingerprint_message">Choose your backup screen lock method</string>
 
diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/SetupChooseLockGeneric.java
index 5a6ac7fa465..fb5cd8a32a2 100644
--- a/src/com/android/settings/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/SetupChooseLockGeneric.java
@@ -67,7 +67,6 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
                 Bundle savedInstanceState) {
             final SetupWizardListLayout layout = (SetupWizardListLayout) inflater.inflate(
                     R.layout.setup_choose_lock_generic, container, false);
-            layout.setHeaderText(getActivity().getTitle());
 
             final NavigationBar navigationBar = layout.getNavigationBar();
             navigationBar.getNextButton().setEnabled(false);