diff --git a/.bashrc b/.bashrc
index aa80e56..131dde6 100644
--- a/.bashrc
+++ b/.bashrc
@@ -31,6 +31,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"
+    complete -F _ssh hpnssh
 else
     alias ssh="ssh -C -e none"
 fi
diff --git a/.zshrc b/.zshrc
index 7aedd2d..9062485 100644
--- a/.zshrc
+++ b/.zshrc
@@ -29,6 +29,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