1 files changed, 6 insertions, 4 deletions
diff --git a/Completion/User/_user_at_host b/Completion/User/_user_at_host
index 6006ef63b..c33a024d9 100644
--- a/Completion/User/_user_at_host
+++ b/Completion/User/_user_at_host
@@ -1,15 +1,17 @@
 #autoload
 
-local expl nm="$compstate[nmatches]"
-
 if [[ -prefix 1 *@ ]]; then
+
+  _tags any:user-at hosts || return 1
+
   local user=${PREFIX/@}
+
   compset -P 1 '*@'
   _description expl "hostnames for $user"
   _combination accounts_users_hosts users="$user" hosts "$expl[@]" "$@"
 else
+  _tags any users || return 1
+
   _description expl "usernames"
   _combination accounts_users_hosts users -S@ -q "$expl[@]" "$@"
 fi
-
-[[ nm -ne compstate[nmatches] ]]