diff --git a/server/vglrun.in b/server/vglrun.in
index 27af814..33ea47d 100644
--- a/server/vglrun.in
+++ b/server/vglrun.in
@@ -34,6 +34,8 @@
 #$ -v VGL_PROGRESSIVE
 #$ -v VGL_NPROCS
 
+VGL_XAUTH_FILE="/var/lib/vgl/vgl_xauth_key"
+
 usage()
 {
 	echo
@@ -185,15 +187,8 @@ then
 	usage 0
 fi
 
-if [ -r /etc/opt/VirtualGL/vgl_xauth_key ]; then
-	XAUTH=xauth
-	if [ -x /usr/X11R6/bin/xauth ]; then
-		XAUTH=/usr/X11R6/bin/xauth
-	fi
-	if [ -x /usr/openwin/bin/xauth ]; then
-		XAUTH=/usr/openwin/bin/xauth
-	fi
-	$XAUTH merge /etc/opt/VirtualGL/vgl_xauth_key
+if [ -r $VGL_XAUTH_FILE ]; then
+       xauth merge $VGL_XAUTH_FILE
 fi
 
 SSH_IP=`echo $SSH_CLIENT | cut -d' ' -f1 | cut -d: -f4`