diff --git a/ChangeLog b/ChangeLog
index d89a90512..cf03505ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-24  Sven Wischnowsky  <wischnow@zsh.org>
+
+	* 15468: Completion/Unix/Command/_ssh: improve user/host
+	completion before a @
+
 2001-07-20  Peter Stephenson  <pws@csr.com>
 
 	* 15432: Functions/Zle/bash-transpose-words, Doc/Zsh/contrib.yo:
diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh
index 8b3c8f0c4..6936173f4 100644
--- a/Completion/Unix/Command/_ssh
+++ b/Completion/Unix/Command/_ssh
@@ -143,6 +143,8 @@ _ssh () {
       userhost)
         if compset -P '*@'; then
 	  _wanted hosts expl 'remote host name' _ssh_hosts && ret=0
+        elif compset -S '@*'; then
+          _wanted users expl 'login name' _ssh_users -S '' && ret=0
         else
           if (( $+opt_args[-l] )); then
 	    tmp=()