diff --git a/templates/lockscreen/lockscreen.env.j2 b/templates/lockscreen/lockscreen.env.j2
index 80a4a8e..52dc46a 100644
--- a/templates/lockscreen/lockscreen.env.j2
+++ b/templates/lockscreen/lockscreen.env.j2
@@ -1,6 +1,6 @@
 {{ ansible_managed | comment }}
 
-#XSECURELOCK_SAVER=$HOME/.screensaver.sh
+XSECURELOCK_SAVER={{ansible_user_dir}}/.screensaver.sh
 XSECURELOCK_AUTH_BACKGROUND_COLOR={{home_base_color_hue|hsv2rgb(66,47)}}
 XSECURELOCK_SWITCH_USER_COMMAND=dm-tool switch-to-greeter
-XSECURELOCK_AUTH_TIMEOUT=5
+XSECURELOCK_AUTH_TIMEOUT=30
diff --git a/templates/lockscreen/lockscreen.service.j2 b/templates/lockscreen/lockscreen.service.j2
index d163c01..33b1075 100644
--- a/templates/lockscreen/lockscreen.service.j2
+++ b/templates/lockscreen/lockscreen.service.j2
@@ -11,6 +11,7 @@ ExecStartPost=xset dpms $XSECURELOCK_AUTH_TIMEOUT $XSECURELOCK_AUTH_TIMEOUT $XSE
 NotifyAccess=all
 EnvironmentFile=%h/.lockscreen.env
 ExecStopPost=xset dpms {{ display_sleeptime | int }} {{ display_sleeptime | int }} {{ display_sleeptime | int }}
+ExecStopPost=xset dpms force on
 
 [Install]
 WantedBy=graphical-session.target