diff --git a/share/functions/fish_fallback_prompt.fish b/share/functions/fish_fallback_prompt.fish
index d8b976001..17cd48477 100644
--- a/share/functions/fish_fallback_prompt.fish
+++ b/share/functions/fish_fallback_prompt.fish
@@ -5,7 +5,7 @@
 function fish_fallback_prompt --description "A simple fallback prompt without too much color or special characters for linux VTs"
     set -l color_cwd
     set -l suffix
-    switch $USER
+    switch "$USER"
         case root toor
             if set -q fish_color_cwd_root
                 set color_cwd $fish_color_cwd_root
diff --git a/share/functions/fish_prompt.fish b/share/functions/fish_prompt.fish
index 153d3adbc..5aef15819 100644
--- a/share/functions/fish_prompt.fish
+++ b/share/functions/fish_prompt.fish
@@ -5,7 +5,7 @@
 function fish_prompt --description "Write out the prompt"
     set -l color_cwd
     set -l suffix
-    switch $USER
+    switch "$USER"
         case root toor
             if set -q fish_color_cwd_root
                 set color_cwd $fish_color_cwd_root
diff --git a/share/tools/web_config/sample_prompts/classic.fish b/share/tools/web_config/sample_prompts/classic.fish
index 2eaa4ddd0..6bc71c962 100644
--- a/share/tools/web_config/sample_prompts/classic.fish
+++ b/share/tools/web_config/sample_prompts/classic.fish
@@ -2,7 +2,7 @@
 function fish_prompt --description "Write out the prompt"
     set -l color_cwd
     set -l suffix
-    switch $USER
+    switch "$USER"
         case root toor
             if set -q fish_color_cwd_root
                 set color_cwd $fish_color_cwd_root
diff --git a/share/tools/web_config/sample_prompts/classic_status.fish b/share/tools/web_config/sample_prompts/classic_status.fish
index dd0548949..092a8e205 100644
--- a/share/tools/web_config/sample_prompts/classic_status.fish
+++ b/share/tools/web_config/sample_prompts/classic_status.fish
@@ -12,7 +12,7 @@ function fish_prompt --description "Write out the prompt"
 
     set -l color_cwd
     set -l suffix
-    switch $USER
+    switch "$USER"
         case root toor
             if set -q fish_color_cwd_root
                 set color_cwd $fish_color_cwd_root
diff --git a/share/tools/web_config/sample_prompts/classic_vcs.fish b/share/tools/web_config/sample_prompts/classic_vcs.fish
index 9635bb74c..92e75346f 100644
--- a/share/tools/web_config/sample_prompts/classic_vcs.fish
+++ b/share/tools/web_config/sample_prompts/classic_vcs.fish
@@ -49,7 +49,7 @@ function fish_prompt --description 'Write out the prompt'
     set -l color_cwd
     set -l prefix
     set -l suffix
-    switch $USER
+    switch "$USER"
         case root toor
             if set -q fish_color_cwd_root
                 set color_cwd $fish_color_cwd_root
diff --git a/share/tools/web_config/sample_prompts/debian_chroot.fish b/share/tools/web_config/sample_prompts/debian_chroot.fish
index 249dc91ab..df54b5f99 100644
--- a/share/tools/web_config/sample_prompts/debian_chroot.fish
+++ b/share/tools/web_config/sample_prompts/debian_chroot.fish
@@ -30,7 +30,7 @@ function fish_prompt --description 'Write out the prompt, prepending the Debian
         echo -n -s "$__fish_prompt_chroot_env" "$__fish_debian_chroot_prompt" "$__fish_prompt_normal" ' '
     end
 
-    switch $USER
+    switch "$USER"
 
         case root toor
 
diff --git a/share/tools/web_config/sample_prompts/informative.fish b/share/tools/web_config/sample_prompts/informative.fish
index 3f084bd30..223a9a251 100644
--- a/share/tools/web_config/sample_prompts/informative.fish
+++ b/share/tools/web_config/sample_prompts/informative.fish
@@ -20,7 +20,7 @@ function fish_prompt --description 'Write out the prompt'
         set __fish_color_status (set_color -o red)
     end
 
-    switch $USER
+    switch "$USER"
 
         case root toor
 
diff --git a/share/tools/web_config/sample_prompts/informative_vcs.fish b/share/tools/web_config/sample_prompts/informative_vcs.fish
index f52ba355b..f83f94489 100644
--- a/share/tools/web_config/sample_prompts/informative_vcs.fish
+++ b/share/tools/web_config/sample_prompts/informative_vcs.fish
@@ -68,7 +68,7 @@ function fish_prompt --description 'Write out the prompt'
     set -l color_cwd
     set -l prefix
     set -l suffix
-    switch $USER
+    switch "$USER"
         case root toor
             if set -q fish_color_cwd_root
                 set color_cwd $fish_color_cwd_root
diff --git a/share/tools/web_config/sample_prompts/nim.fish b/share/tools/web_config/sample_prompts/nim.fish
index 6c6616821..0e4e548f2 100644
--- a/share/tools/web_config/sample_prompts/nim.fish
+++ b/share/tools/web_config/sample_prompts/nim.fish
@@ -16,7 +16,7 @@ function fish_prompt
     end
     set_color -o green
     echo -n [
-    if test $USER = root -o $USER = toor
+    if test "$USER" = root -o "$USER" = toor
         set_color -o red
     else
         set_color -o yellow
diff --git a/share/tools/web_config/sample_prompts/robbyrussell.fish b/share/tools/web_config/sample_prompts/robbyrussell.fish
index a40dac735..1da972182 100644
--- a/share/tools/web_config/sample_prompts/robbyrussell.fish
+++ b/share/tools/web_config/sample_prompts/robbyrussell.fish
@@ -69,7 +69,7 @@ function fish_prompt
     end
 
     set -l arrow "$arrow_color➜ "
-    if [ $USER = 'root' ]
+    if test "$USER" = 'root'
         set arrow "$arrow_color# "
     end
 
diff --git a/share/tools/web_config/sample_prompts/sorin.fish b/share/tools/web_config/sample_prompts/sorin.fish
index 60f40307c..5246aaf02 100644
--- a/share/tools/web_config/sample_prompts/sorin.fish
+++ b/share/tools/web_config/sample_prompts/sorin.fish
@@ -4,7 +4,7 @@
 function fish_prompt
     test $SSH_TTY
     and printf (set_color red)$USER(set_color brwhite)'@'(set_color yellow)(prompt_hostname)' '
-    test $USER = 'root'
+    test "$USER" = 'root'
     and echo (set_color red)"#"
 
     # Main
diff --git a/share/tools/web_config/sample_prompts/user_host_path.fish b/share/tools/web_config/sample_prompts/user_host_path.fish
index 4082610a6..37e13bf47 100644
--- a/share/tools/web_config/sample_prompts/user_host_path.fish
+++ b/share/tools/web_config/sample_prompts/user_host_path.fish
@@ -5,7 +5,7 @@ function fish_prompt -d "Write out the prompt"
     set -l home_escaped (echo -n $HOME | sed 's/\//\\\\\//g')
     set -l pwd (echo -n $PWD | sed "s/^$home_escaped/~/" | sed 's/ /%20/g')
     set -l prompt_symbol ''
-    switch $USER
+    switch "$USER"
         case root toor
             set prompt_symbol '#'
         case '*'