1 files changed, 3 insertions, 1 deletions
diff --git a/zshrc b/zshrc
index 332c6defc..5df8d4930 100644
--- a/zshrc
+++ b/zshrc
@@ -7,7 +7,7 @@ export ZSH=$HOME/.oh-my-zsh
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
 ZSH_THEME="agnoster"
-DEFAULT_USER="joe"
+DEFAULT_USER=""
 
 alias paclsorphans='sudo pacman -Qdt'
 alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
@@ -76,6 +76,8 @@ export EDITOR='vim'
 export PATH="$HOME/.cabal/bin:$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
 
 if [[ -z "$SSH_CLIENT" ]]; then
+    # When not in SSH
+    DEFAULT_USER=$USER
     SSH_AUTH_SOCK=/run/user/$UID/gnupg/S.gpg-agent.ssh; export SSH_AUTH_SOCK;
 fi