diff --git a/completion/available/ssh.completion.bash b/completion/available/ssh.completion.bash
index 3252267fb0..dc3ac5b3dd 100644
--- a/completion/available/ssh.completion.bash
+++ b/completion/available/ssh.completion.bash
@@ -1,7 +1,8 @@
 # shellcheck shell=bash
 # Bash completion support for ssh.
 
-export COMP_WORDBREAKS=${COMP_WORDBREAKS/\:/}
+# Remove : and @ from COMP_WORDBREAKS to support user@host completion
+export COMP_WORDBREAKS=${COMP_WORDBREAKS//[:@]/}
 
 _sshcomplete() {
 	local line CURRENT_PROMPT="${COMP_WORDS[COMP_CWORD]}"