Amend - to _ in username