Replace dynamic second-person/third-person swap with hard-coded username, closes #1461