diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4ac6977397d..e2df885af6b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5218,9 +5218,10 @@
     <string name="credentials_not_erased">Credential storage couldn\u2019t be erased.</string>
     <!-- Toast message [CHAR LIMIT=30] -->
     <string name="credentials_enabled">Credential storage is enabled.</string>
-    <!-- Description of dialog to explain that a lock screen password is required to use credential storage [CHAR LIMIT=NONE] -->
-    <string name="credentials_configure_lock_screen_hint">You need to set a lock screen PIN or password before you can use credential storage.</string>
-
+    <!-- This string is in a dialog, and the dialog shows up on a device that's managed by a user's company. It lets the user know that they need to have a secure lock screen (PIN, password, or pattern) before they can use credential storage [CHAR LIMIT=NONE] -->
+    <string name="credentials_configure_lock_screen_hint">Before you can use credential storage, your device need to have a secure lock screen</string>
+    <!-- This string is for the content of the button that leads user to lock screen settings  [CHAR LIMIT=20] -->
+    <string name="credentials_configure_lock_screen_button">SET LOCK</string>
     <!-- Title of Usage Access preference item [CHAR LIMIT=30] -->
     <string name="usage_access_title">Apps with usage access</string>
 
diff --git a/src/com/android/settings/security/ConfigureKeyGuardDialog.java b/src/com/android/settings/security/ConfigureKeyGuardDialog.java
index 3c893407698..dfe3bbe314e 100644
--- a/src/com/android/settings/security/ConfigureKeyGuardDialog.java
+++ b/src/com/android/settings/security/ConfigureKeyGuardDialog.java
@@ -51,7 +51,7 @@ public class ConfigureKeyGuardDialog extends InstrumentedDialogFragment
         return new AlertDialog.Builder(getActivity())
                 .setTitle(android.R.string.dialog_alert_title)
                 .setMessage(R.string.credentials_configure_lock_screen_hint)
-                .setPositiveButton(android.R.string.ok, this)
+                .setPositiveButton(R.string.credentials_configure_lock_screen_button, this)
                 .setNegativeButton(android.R.string.cancel, this)
                 .create();
     }