diff --git a/input/stage50/usr/local/bin/opus-dvn_lock b/input/stage50/usr/local/bin/opus-dvn_lock
new file mode 100755
index 0000000..16f1dbc
--- /dev/null
+++ b/input/stage50/usr/local/bin/opus-dvn_lock
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+xset dpms force off
+xsecurelock
diff --git a/input/stage98/etc/skel/.config/autostart/lockscreen.desktop b/input/stage98/etc/skel/.config/autostart/lockscreen.desktop
new file mode 100644
index 0000000..3a2a1b2
--- /dev/null
+++ b/input/stage98/etc/skel/.config/autostart/lockscreen.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.9.4
+Type=Application
+Name=lockscreen
+Comment=
+Exec=xautolock -time 15 -locker opus-dvn_lock
+OnlyShowIn=XFCE;
+RunHook=0
+StartupNotify=false
+Terminal=false
+Hidden=false
+
diff --git a/input/stage98/etc/skel/.config/autostart/xscreensaver.desktop b/input/stage98/etc/skel/.config/autostart/xscreensaver.desktop
new file mode 100644
index 0000000..5673067
--- /dev/null
+++ b/input/stage98/etc/skel/.config/autostart/xscreensaver.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+
diff --git a/input/stage98/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/input/stage98/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
index f3eaf08..97768f5 100644
--- a/input/stage98/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+++ b/input/stage98/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
@@ -3,7 +3,7 @@
 <channel name="xfce4-session" version="1.0">
   <property name="general" type="empty">
     <property name="FailsafeSessionName" type="empty"/>
-    <property name="LockCommand" type="empty"/>
+    <property name="LockCommand" type="string" value="opus-dvn_lock"/>
     <property name="SessionName" type="string" value="Default"/>
     <property name="SaveOnExit" type="bool" value="false"/>
   </property>