diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index fbe0f1cfc54..4ce76ce4951 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -214,7 +214,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
 
         mOwnerInfoPref = findPreference(KEY_OWNER_INFO_SETTINGS);
         if (mOwnerInfoPref != null) {
-            mOwnerInfoPref.setEnabled(!mLockPatternUtils.isDeviceOwnerInfoEnabled());
+            mOwnerInfoPref.setEnabled(!mLockPatternUtils.isLockScreenDisabled(MY_USER_ID)
+                    && !mLockPatternUtils.isDeviceOwnerInfoEnabled());
 
             if (mOwnerInfoPref.isEnabled()) {
                 mOwnerInfoPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {