Use whoami instead of hard-coded username