diff --git a/files/.bash_completion b/files/.bash_completion
index 728278f..526ecc9 100644
--- a/files/.bash_completion
+++ b/files/.bash_completion
@@ -1,6 +1,10 @@
 #!/bin/bash
 # Loads external completion files
 
-source ~/.scripts/git-completion.bash
-source ~/.scripts/pass.bash-completion
+function load {
+	[ -f "$1" ] && source "$1"
+}
+
+load ~/.scripts/git-completion.bash
+load /usr/share/bash-completion/completions/pass.bash-completion
 
diff --git a/files/.config/i3/config b/files/.config/i3/config
index bbf1b7c..458f4da 100644
--- a/files/.config/i3/config
+++ b/files/.config/i3/config
@@ -206,5 +206,5 @@ exec --no-startup-id /bin/bash ~/.config/i3/bin/wallpaper
 exec --no-startup-id nm-applet
 
 # Screen lock
-exec xautolock -time 10 -locker i3lock
+exec xautolock -time 10 -locker ~/.config/i3/bin/i3lock