diff --git a/share/functions/__fish_complete_user_at_hosts.fish b/share/functions/__fish_complete_user_at_hosts.fish
new file mode 100644
index 000000000..223806623
--- /dev/null
+++ b/share/functions/__fish_complete_user_at_hosts.fish
@@ -0,0 +1,5 @@
+function __fish_complete_user_at_hosts -d "Print list host-names with user@"
+  for user_at in (commandline -ct | string match -r '.*@'; or echo "")(__fish_print_hostnames)
+    echo $user_at
+  end
+end
\ No newline at end of file