diff --git a/fish_prompt.fish b/fish_prompt.fish
index 36cc2f7..aed384d 100644
--- a/fish_prompt.fish
+++ b/fish_prompt.fish
@@ -398,7 +398,7 @@ function __bobthefish_prompt_status -S -a last_status -d 'Display symbols for a
   end
 end
 
-function __bobthefish_prompt_user -S -d 'Display actual user if different from $default_user'
+function __bobthefish_prompt_user -S -d 'Display actual user if different from $default_user in a prompt segment'
   if [ "$theme_display_user" = 'yes' ]
     if [ "$USER" != "$default_user" -o -n "$SSH_CLIENT" ]
       __bobthefish_start_segment $__color_username
diff --git a/fish_title.fish b/fish_title.fish
index 308f42d..cedc8da 100644
--- a/fish_title.fish
+++ b/fish_title.fish
@@ -3,7 +3,19 @@
 #     set -g theme_title_display_path no
 #     set -g theme_title_use_abbreviated_path no
 
+function __bobthefish_user -S -d 'Display actual user if different from $default_user'
+  if [ "$theme_display_user" = 'yes' ]
+    if [ "$USER" != "$default_user" -o -n "$SSH_CLIENT" ]
+      set -l IFS .
+      hostname | read -l hostname __
+      echo -ns (whoami) '@' $hostname ' '
+    end
+  end
+end
+
 function fish_title
+  __bobthefish_user
+
   if [ "$theme_title_display_process" = 'yes' ]
     echo $_