diff --git a/cli/.config/fish/functions/fish_prompt.fish b/cli/.config/fish/functions/fish_prompt.fish
index ff8af6e..cf683ec 100644
--- a/cli/.config/fish/functions/fish_prompt.fish
+++ b/cli/.config/fish/functions/fish_prompt.fish
@@ -1,6 +1,7 @@
 function fish_prompt
     set -g prompt_string
     set -g prev_color
+    prompt.user
     prompt.add blue (prompt_pwd)
     prompt.git
     prompt.add normal $prompt_bang
diff --git a/cli/.config/fish/functions/prompt.user.fish b/cli/.config/fish/functions/prompt.user.fish
new file mode 100644
index 0000000..102c768
--- /dev/null
+++ b/cli/.config/fish/functions/prompt.user.fish
@@ -0,0 +1,5 @@
+function prompt.user
+    if test -n "$SSH_CLIENT" || string match -qe root "$USER"
+        prompt.add black $USER@$hostname
+    end
+end