@@ -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.)"