diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index 72c409b3..89e91435 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -1479,7 +1479,13 @@ if [ `whoami` != root -o "$l32" ]; then
 	opts=""
 	[ "$config_file" ] && opts="$opts --config-file $config_file"
 	#debug="/bin/bash -x"
-	ssh -l root localhost $l32 $debug /bin/bash $exe $@ -p $root_password_file -u $scm_user -w $cwd $opt_ssh_auth_sock -P "$PATH" $opts
+
+	ssh=ssh
+	[ "$CVS_RSH" ] && ssh="$CVS_RSH"
+	[ "$GIT_SSH" ] && ssh="$GIT_SSH"
+	ssh=`which $ssh`
+	[ -x "$ssh" ] || fatal "SSH executable \"$ssh\" not found"
+	$ssh -l root localhost $l32 $debug /bin/bash $exe $@ -p $root_password_file -u $scm_user -w $cwd $opt_ssh_auth_sock -P "$PATH" $opts
 
 	exit $?
 fi
diff --git a/scripts/purge-stale-projects.sh b/scripts/purge-stale-projects.sh
index 73aa59e4..08678258 100644
--- a/scripts/purge-stale-projects.sh
+++ b/scripts/purge-stale-projects.sh
@@ -44,11 +44,9 @@ check_scm()
 ssh=ssh
 [ "$CVS_RSH" ] && ssh="$CVS_RSH"
 [ "$GIT_SSH" ] && ssh="$GIT_SSH"
-[ "$JANWARE_USER" ] || JANWARE_USER=`whoami`
 ssh=`which $ssh`
-
 [ -x "$ssh" ] || fatal "SSH executable \"$ssh\" not found"
-
+[ "$JANWARE_USER" ] || JANWARE_USER=`whoami`
 ssh="$ssh -l $JANWARE_USER"
 
 for host in cvs.jannet.de git.jannet.de; do