properly handle the username
2 files changed