diff --git a/overlay/AndroidRpiOverlay/res/values/config.xml b/overlay/AndroidRpiOverlay/res/values/config.xml
index 455fc6d..e17fa96 100644
--- a/overlay/AndroidRpiOverlay/res/values/config.xml
+++ b/overlay/AndroidRpiOverlay/res/values/config.xml
@@ -121,7 +121,4 @@
     <bool name="config_cecTvSendStandbyOnSleepEnabled_default">false</bool>
     <bool name="config_cecTvSendStandbyOnSleepDisabled_default">true</bool>
 
-    <!-- Is the lock-screen disabled for new users by default -->
-    <bool name="config_disableLockscreenByDefault">true</bool>
-
 </resources>
diff --git a/overlay/SettingsProviderRpiOverlay/res/values/defaults.xml b/overlay/SettingsProviderRpiOverlay/res/values/defaults.xml
index 8e11022..8a8ac4a 100644
--- a/overlay/SettingsProviderRpiOverlay/res/values/defaults.xml
+++ b/overlay/SettingsProviderRpiOverlay/res/values/defaults.xml
@@ -27,6 +27,9 @@
     <!-- Disable location by default -->
     <integer name="def_location_mode">0</integer>
 
+    <!-- Disable the lockscreen -->
+    <bool name="def_lockscreen_disabled">true</bool>
+
     <!-- Keep screen on at all times by default -->
     <bool name="def_stay_on_while_plugged_in">true</bool>
 
diff --git a/vendor.prop b/vendor.prop
index 9f35e5d..9ca73f2 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -68,6 +68,9 @@ ro.lmk.medium=800
 ro.lmk.upgrade_pressure=100
 ro.lmk.use_minfree_levels=true
 
+# Lockscreen
+ro.lockscreen.disable.default=true
+
 # Media
 debug.stagefright.c2inputsurface=-1