removing dependency on local `whoami` matching remote username