diff --git a/.config/zsh/.zlogin b/.config/zsh/.zlogin
index dffc582..2465dfe 100644
--- a/.config/zsh/.zlogin
+++ b/.config/zsh/.zlogin
@@ -7,7 +7,12 @@ for config_file ($ZDOTDIR/lib/30-*.zsh) source $config_file
 (
 #Initalize and compile completion cache
 autoload -Uz compinit
-compinit
+
+if [ "$(id -u)" -ne 0 ]; then
+  compinit  -i # Ignore insecure directories
+else
+  compinit
+fi
 
 ## Compile startup files
 
diff --git a/.config/zsh/lib/20-completion.zsh b/.config/zsh/lib/20-completion.zsh
index 5ba2d8f..6aab75c 100644
--- a/.config/zsh/lib/20-completion.zsh
+++ b/.config/zsh/lib/20-completion.zsh
@@ -10,6 +10,7 @@ WORDCHARS=''
 
 zmodload -i zsh/complist
 fpath=($fpath $ZDOTDIR/completions/)
+fpath=($fpath /usr/local/share/zsh/)
 fpath=($fpath /usr/local/share/zsh/site-functions/)
 
 ## case-insensitive (all),partial-word and then substring completion