Index: fish/config.fish
==================================================================
--- fish/config.fish
+++ fish/config.fish
@@ -20,10 +20,12 @@
 set -g fish_color_suffix 29bc7d
 set -g fish_color_user 00ff00
 set -g fish_color_valid_path normal
 set -g fish_color_vcs 43d696
 set -g fish_color_vcs_braces 29bc7d
+
+set -g fish_normal_user js
 
 test -n "$XDG_CONFIG_HOME"
 or set -x XDG_CONFIG_HOME $HOME/.config
 test -n "$XDG_CACHE_HOME"
 or set -x XDG_CACHE_HOME $HOME/.cache

Index: fish/functions/fish_prompt.fish
==================================================================
--- fish/functions/fish_prompt.fish
+++ fish/functions/fish_prompt.fish
@@ -19,9 +19,10 @@
         set vcs (set_color $fish_color_vcs_braces)"(" \
                 (set_color $fish_color_vcs)"$branch" \
                 (set_color $fish_color_vcs_braces)")"
     end
 
-    echo -n -s (set_color $fish_color_host) (prompt_hostname) ' ' \
-               (set_color $fish_color_cwd) (prompt_pwd) (string join '' $vcs) \
-               (set_color $fish_color_suffix) $suffix (set_color normal) ' '
+    echo -n -s (set_color $fish_color_host) (prompt_user) (prompt_hostname) \
+               ' ' (set_color $fish_color_cwd) (prompt_pwd) \
+               (string join '' $vcs) (set_color $fish_color_suffix) $suffix \
+               (set_color normal) ' '
 end

ADDED   fish/functions/prompt_user.fish
Index: fish/functions/prompt_user.fish
==================================================================
--- fish/functions/prompt_user.fish
+++ fish/functions/prompt_user.fish
@@ -0,0 +1,5 @@
+function prompt_user
+    if test (whoami) != "$fish_normal_user"
+        echo (whoami)"@"
+    end
+end

Index: zshrc
==================================================================
--- zshrc
+++ zshrc
@@ -12,10 +12,11 @@
 local grep_color="auto"
 local ls=""
 local ls_color="auto"
 local ls_on_cd="yes"
 local ls_on_init="no"
+local normal_user="js"
 
 if [ "$COLORTERM" = "24bit" -o "$COLORTERM" = "truecolor" \
     -o "$terminfo[colors]" = 16777216 ]; then
 	local color_cwd="#209060"
 	local color_host="#176945"
@@ -97,11 +98,15 @@
 	if [ -n "$1" ]; then
 	       	local branch="%F{$color_vcs_braces}(%F{$color_vcs}$1"
 		branch+="%F{$color_vcs_braces})"
 	fi
 
-	PS1="%F{$color_host}%m %F{$color_cwd}%c$branch"
+	if [ "$(whoami)" != "$normal_user" ]; then
+		local user="%n@"
+	fi
+
+	PS1="%F{$color_host}$user%m %F{$color_cwd}%c$branch"
 	PS1+="%F{$color_suffix}%(!.#.>)%f "
 	PS2="%B>%b "
 	RPS1="%(1j.%F{$color_jobs}%B%j%b%f.)%(?..%(1j. .)"
 	RPS1+="%F{$color_status}%B%?%b%f)"
 	RPS2="%(1_.%F{black}%B(%_%)%b%f.)"