diff --git a/fish/config.fish b/fish/config.fish
index 0564ed6..5a62519 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -3,9 +3,16 @@ if status is-interactive
     set -x GPG_TTY (tty)
 end
 
-set PATH $HOME/bin $HOME/.local/bin (go env GOPATH)/bin $PATH
 set -g fish_greeting
 
+# Path stuff
+if command -q go
+    fish_add_path (go env GOPATH)/bin
+end
+
+fish_add_path $HOME/bin
+fish_add_path $HOME/.local/bin
+
 # Colors
 set fish_color_user normal
 set fish_color_host blue
diff --git a/fish/functions/prompt_login.fish b/fish/functions/prompt_login.fish
index c8b6703..5ca4c24 100644
--- a/fish/functions/prompt_login.fish
+++ b/fish/functions/prompt_login.fish
@@ -21,6 +21,8 @@ function prompt_login --description 'display user name for the prompt'
     # If we're running via SSH, change the host color.
     set -l color_host $fish_color_host
     if set -q SSH_TTY; and set -q fish_color_host_remote
-        echo -n -s (set_color $fish_color_user) "$USER" (set_color normal) / (set_color $color_host) (prompt_hostname) (set_color normal)
+        set color_host $fish_color_host_remote
     end
+
+    echo -n -s (set_color $fish_color_user) "$USER" (set_color normal) / (set_color $color_host) (prompt_hostname) (set_color normal)
 end