diff --git a/shell/ssh/install b/shell/ssh/install
index da10d2ef..37a3d7dd 100755
--- a/shell/ssh/install
+++ b/shell/ssh/install
@@ -35,7 +35,7 @@ sudo sed -i 's/^#\(AllowTcpForwarding\).*/\1 yes/;
             ' "$sshconf"
 
 # Enable X11 forwarding on desktop PCs (not remotes)
-if [[ $OSTYPE == darwin* || -f /etc/arch-release ]]; then
+if [[ -z $SERVER ]]; then
     sudo sed -i 's/^#\(X11Forwarding\).*/\1 yes/;
                  s/^#\(X11DisplayOffset.*\)/\1/;
                  s/^#\(X11UseLocalhost\).*/\1 yes/;