diff --git a/.zshrc b/.zshrc
index 7aedd2d..247e67e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -2,6 +2,9 @@
 umask 022
 cd "$HOME"
 #
+autoload -Uz compinit
+compinit
+#
 alias "SYNC=sync;sync;sync"
 alias "c=clear"
 alias "ccat=pygmentize -g"
@@ -29,6 +32,7 @@ alias "udac=sudo apt update; sudo apt dist-upgrade -y; sudo apt autoremove -y; s
 #
 if command -v hpnssh > /dev/null; then
     alias "ssh=hpnssh -C -e none"
+    compdef hpnssh=ssh
 else
     alias "ssh=ssh -C -e none"
 fi
diff --git a/.zshrc.local b/.zshrc.local
index cba098d..48daf5e 100644
--- a/.zshrc.local
+++ b/.zshrc.local
@@ -1,6 +1,8 @@
 #
-autoload -Uz compinit
-compinit
+if ! whence compinit >/dev/null; then
+  autoload -Uz compinit && compinit
+  compinit
+fi
 [[ -s /usr/share/doc/fzf/examples/completion.zsh ]] && source /usr/share/doc/fzf/examples/completion.zsh
 [[ -s /usr/share/doc/fzf/examples/key-bindings.zsh ]] && source /usr/share/doc/fzf/examples/key-bindings.zsh
 #